DO NOT MERGE: Apply upstream Chromium patch for encoding changes am: 22b8fccb am: 5a3fc568 am: 7197e7fa -s ours am: ea9f6e20 -s ours am: 5fbbf77a Change-Id: I40a3c804364e121cff032273b50be365a63cb597