Merge "Add support for no-vendor-variant VNDK"