Merge "external/webp: cherry-pick alpha decoding fix" am: f3c081dcee am: ed6274e426
am: 022db77a38

Change-Id: I4dc09103acf5a299764dda4bc88e0dbc6dd34965