Merge "add llndk|vndksp.libraries.txt to vndk_package" into oc-mr1-dev