Merge "Reformat Android.bp file" am: a5510434d6 am: 343b9da05f
am: 128e6001ea

Change-Id: I26f81994a21b46dfa7877d7a2428ff8972193b32