Merge "add llndk|vndksp.libraries.txt to vndk_package" am: 4bbcddf64d  -s ours
am: 2ebeed0a57  -s ours

Change-Id: I662c32861d32c6a07abda5e9b321b92519e9350a