Merge "Reformat Android.bp file using bpfmt"