Reverted to older version of WebP, newer one crashed on Android.
Merge remote-tracking branch 'upstream/master'