Merge "update to v1.2.1" am: 84cdd3fa7d am: 0dd1133823 am: bc8db48636

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

Change-Id: Id16c84da7bf7275b9529981958c9e1c214471502