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

Change-Id: If8faad8688e81a2fbb22d9845078d0b71c4ac44b