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

Change-Id: I1bf504eccfdb019bf8f301ef71afa89acba7bcb5