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

Change-Id: If9d58f1c28fb745af69c62e5f02be2b01a1e4d10