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 Change-Id: I86c8711edd2d412bd0230b314feb90378a5cf744