am 55536138: Merge "libstagefright/matroska: Fix build with gcc 4.7"

* commit '55536138cc0febbe83608ee0103aaa9a5202e31f':
  libstagefright/matroska: Fix build with gcc 4.7