Merge "Reformat all .bp files using bpfmt -w"
am: bc052d6af1

Change-Id: I0064b58642641ca2d543b5f5506ecbecc8c9d6f4