Merge "bpfmt."
am: 0609e8d231

Change-Id: I810b09372da24d4b84bbeaa5d0c03ec0baf928fd