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

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

Change-Id: I03bd385a47d52f7202b33424816bc90bcf81bd1f