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

Change-Id: I91e5a46e6f27c0f135f805c1b033ad4671ea241c