Merge "Reformat Android.bp file"
am: a5510434d6

Change-Id: I19492f08ec3854e50e230d69be61702ad69d081b