Merge "Add library list for VNDK using core variant"