Merge "Use com.android.vndk.current variant for vndk list" am: 9e52397825 am: abe56ba48d am: ef7d87cb42
am: bfe39c0f42

Change-Id: Id8366e8216a55288f6456247ea467ccc20999738