Merge "Reformat Android.bp file"
am: ed568f3fe2

Change-Id: I1c19e70d96447df2d186cd96490f01275e7a612b