DO NOT MERGE: Apply upstream Chromium patch for encoding changes am: 22b8fccba6
am: 5a3fc56839

Change-Id: I9de86905d6eef70906a566c6ef4f7f5146a99bfc