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

Change-Id: Icfb8ba052d346cddfe50d5101ffce23c3de2dd17