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

Change-Id: I85e0896c0054b7d49e8cfc3f6190f6e657df63c9