Merge "Update Android.bp with latest Android.mk changes"