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

Change-Id: I9e5f91175cebd5433efc5365d6c30149202ac908