[automerger skipped] Merge "Merge Android 12" am: 87023ffacd -s ours am: 6e55a29446 -s ours am: 12390332a6 -s ours

am skip reason: Merged-In I4b71631793d360a50ede5619f3b61dd2cece1ccc with SHA-1 0dd1133823 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/webp/+/1847597

Change-Id: Ie1680e5ce25a5a9815067f4e1b748285f05d3dfb