Merge "Make bpfmt happy." into main am: 3a438a70d4 Original change: https://android-review.googlesource.com/c/platform/external/blktrace/+/3369497 Change-Id: Ic9635009ec2d7764aa52e7291ebc105ab96a92a6 Signed-off-by: Automerger Merge Worker <[email protected]>