Merge "Fix vendor variants generation of vndk"
am: f68f98eeb6

Change-Id: I619ac38162fafdd300902a3deccfc5eaa9dabd8a