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