Merge "Add support for no-vendor-variant VNDK" am: c3e96512c0
am: 5e9c91c404

Change-Id: I63ecdc6bdc4f36fae0b13752f5b1f1f32555f88b