Merge "Add library list for VNDK using core variant" am: e99728fcf2
am: 990a619b0e

Change-Id: I937a68a6152cb087f87b3bf4c681201be00dcd39