Merge "Revert "Use com.android.vndk.current variant for vndk list"" am: 047a7d21d9 am: 5d1428b437 am: c6402d4544
am: ee6e69562b

Change-Id: I4c414117d359b05821bb7b171e46dcb6a429f556