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

Change-Id: I4f617a951778d2faa4a8f2815bfeecf3d482dd08