Merge "Update Android.bp to match Android.mk"