Merge "add llndk|vndksp.libraries.txt to vndk_package"
am: a4fae6e3e4  -s ours

Change-Id: I408e59939993eed410d5ea95f8c9829fbeff20f1