Merge "Reformat Android.bp file using bpfmt"
am: 7203ad7f47

Change-Id: I68e5ea4a7903a09a9939ee601bb683cdf839001b