Merge "Reformat Android.bp file"
am: 1d5d34618a

Change-Id: I0af93f2d0527764421df7748d4d5fab6a7ebd065