Merge "bpfmt -w Android.bp" am: c51996859d am: 829f3f0e14
am: 7e1f1e7654

Change-Id: Ib7ba4faa54478c48a30050f14cb25229ca269fef