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

Change-Id: Ifb5970cc9d9f37373fd4601ced1d8f1560dbb917