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