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

Change-Id: I7f2d8db8fb7ccdcc0b98d60cda2114c152d76544