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

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

Change-Id: I32049437741b46320516356479777cb54605b0e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>