Merge "Reformat Android.bp file" am: ed568f3fe2
am: 60cdd66290

Change-Id: I778335a2d6b9a1a5df8f859aaeb3ff0ab7f091fb