DO NOT MERGE: Apply upstream Chromium patch for encoding changes am: 22b8fccba6 am: 5a3fc56839
am: 7197e7faff  -s ours

Change-Id: I56d07d6711c92357cd920483ce165b86f0229f75