Merge "Revert "Revert "Revert "Use com.android.vndk.current variant for vndk list"""" am: b6a3d3f9d3 am: a397b27526
am: 495805dfc3

Change-Id: I414b108156b6288506aac1473a1aca5a3c9107e8