Merge "Run bpfmt manually." am: 0f546f45d7
am: f8c58207a0

Change-Id: Ibd8c28a073bd9cd5fa80297460a676b1625c6b27