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

Change-Id: I00813fc7897764cec1c391e224e5f5bd287083f8