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

Change-Id: I972e007157a69652923c83e9c22d654717399afa