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

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

Change-Id: Ia3c4388f6e2c26885197611b737fa5fdb4946ae5