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

Change-Id: I8ae9ae99e00b8d3a89e9fd74c475e213cd5b306f