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

Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/3368740

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