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