Merge "Update Android.bp file for RE2." into main