Reformat Android.bp file am: 09f29d31da am: 4a4e6131c3
am: 702b03bc0c

Change-Id: I16e5879468458519f8ea6c151ac5a05983f64f1e