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

Change-Id: I40ee06e408f2a9c5b9099bb26de61ad136c4d6a6