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

Change-Id: I40a3c804364e121cff032273b50be365a63cb597