Merge "Reformat Android.bp file" into main