tree 92833d215f8feaef56ae9a12245b43f82ee0c7ae
parent 0580efe90f4dbe19b093a56be2a259648e31c77d
parent c15a3524ca533d266acaac6aa38e14ac9b3fd30a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580816897 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580816897 +0000

Merge "Fix webp build to avoid linking errors when building on mac" am: 274be04ff7 am: c15a3524ca

Change-Id: Ie02754bb61ea1a1985e529a28d6f0e22c62f3d5c