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

Change-Id: I5b063d3a7b1fd07535334aa6764a128e3342d471