Merge "Revert "Revert "Revert "Revert "Use com.android.vndk.current variant for vndk list""""" am: f77c98a780
am: 5d175a5f8a

Change-Id: I4c9a3858f653a41133f7ebe0815f46a88f4b8f60