Merge "libwebp: cherry-pick demux fix"