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

Change-Id: Ie02754bb61ea1a1985e529a28d6f0e22c62f3d5c