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

Change-Id: Ibeffc954d73d73566238500710d54aa924242f5a