Merge "Use com.android.vndk.current variant for vndk list" am: 9e52397825 am: abe56ba48d
am: ef7d87cb42

Change-Id: I0ec3454870b6f89d68ae4454b295434bfbbf206d