Merge "Update Android.bp to reflect aosp/2763825" into main