Enforce consistent formatting of .bp files
am: 22d367aac3

Change-Id: I8825a1251d70a6e708eb411a2781ef7624bc5d4f