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 am: d538c4151f -s ours

am skip reason: Change-Id Ic6f46033bd525325562e04ef9e8bcb8ebb5b5d41 with SHA-1 1f7c37f373 is in history

Change-Id: I85013eff913909abdc8398a3404749ae2bcd5dd2