Merge "update to 1.2.2 branch (20ef03e)" am: 223ae75fed am: fd8418a39d

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

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