Merge "Make bpfmt happy." into main am: 3a438a70d4 am: 854f867f2d

Original change: https://android-review.googlesource.com/c/platform/external/blktrace/+/3369497

Change-Id: Ie20b9ff03ff6c569409157c3ca3d2c5b0990ced6
Signed-off-by: Automerger Merge Worker <[email protected]>