DO NOT MERGE: Apply upstream Chromium patch for encoding changes am: 22b8fccba6 am: 5a3fc56839 am: 7197e7faff  -s ours am: ea9f6e20ec  -s ours am: 5fbbf77aee am: 36d4345a58  -s ours am: abc430f974
am: 2d0d39638a

Change-Id: I02d678fb0cb657eda2dc55afadf91e00fe68b52a