Merge "Run bpfmt manually."
am: 0f546f45d7

Change-Id: I54e917f3e665c9c9a3ae783d6b5f6fd0f59f34a5