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

Change-Id: I5b260e8856dd1742c097be769c6ccd42b53efc57