Merge "Make bpfmt happy." into main am: be46ae0c3a

Original change: https://android-review.googlesource.com/c/platform/external/libpcap/+/3368739

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