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

Change-Id: Ie4cafc6320b7fdfdabf5a88fdb40366ab7f1f69b