Merge "Fix vendor modules to use shared vndk"