Merge remote-tracking branch 'origin/mandarinduck' into HEAD
authorJohann <johannkoenig@google.com>
Mon, 29 Jan 2018 19:57:00 +0000 (11:57 -0800)
committerJohann <johannkoenig@google.com>
Mon, 29 Jan 2018 19:57:00 +0000 (11:57 -0800)
The following changes were not carried back from the release branch:
  commit f87a4594fbd0b19071a2befebf52d3f5fabd1a9e
  Revert "Add frame width & height to frame pkt. Add test."

  commit c5dc3373dbd442ea299bacf276c4258fa7ce0559
  work around pic issue with gcc 6

BUG=webm:1490

Change-Id: Id3e15983d5565680c05a0c454544003a615a4d7f


Trivial merge