Merge "Revert "Use com.android.vndk.current variant for vndk list"" am: 047a7d21d9
am: 5d1428b437

Change-Id: I5805b564bb92da597935f4212e2366c3a71e7104