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

Change-Id: I4b5f4cb0908d3db95518bab156b816f4c1fbd4b1