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

Change-Id: Id4555b4727feb615b7e250ed2f0903380e87bd98