Merge "[automerger skipped] Merge "Use {llndk,vndksp}.libraries.txt from VNDK APEX" into rvc-dev am: 8929001832 am: 78490f7550 -s ours" into rvc-d1-dev-plus-aosp