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

Change-Id: I5bc733a882b2a4ddfc89f26a56b22acce8ec249f