Merge commit '2a89246ee4b10d57edaee79e57f491bbda353f93' of sso://googleplex-android/platform/external/webp into HEAD
Change-Id: Ieb1b5b4cb6bcd67054a8291db0a21734cf3f3356