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