Merge "Use {llndk,vndksp}.libraries.txt from VNDK APEX"