DO NOT MERGE: Apply upstream Chromium patch for encoding changes
am: 22b8fccba6

Change-Id: Ie303b81267767f80c6428e686346929c1ee12e4f