Merge "Revert "Revert "Use com.android.vndk.current variant for vndk list"""
am: 7234df438a

Change-Id: Ib0027c2ed5a8d860fef1105db88b764775db2b9a