Merge "add llndk|vndksp.libraries.txt to vndk_package"