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

Change-Id: I3b828567eb591813822e3b061b0328e8bebc241d