Android O IOT Preview 7 (4635859)
Merge "Reformat Android.bp file"