Merge "Add support for vndk llndk libraries in Android.bp" am: f205499be8 am: 9b98a3668c

Original change: https://android-review.googlesource.com/c/platform/development/+/1706410

Change-Id: Id71d7cee80d81539a5a41e76c625ea5498a0d942