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

DO NOT MERGE: Apply upstream Chromium patch for encoding changes am: 22b8fccb am: 5a3fc568 am: 7197e7fa  -s ours am: ea9f6e20  -s ours am: 5fbbf77a am: 36d4345a  -s ours am: abc430f9 am: 2d0d3963 am: 83cae922 am: d564a708  -s ours am: 044380da am: 62908c22 am: ed032d89 am: c9beb52e
am: b8ca8832

Change-Id: Ib680979e64212e79d70573390473a654ed2b79f5