am 05cd296e: Merge "libmedia: Fix build with gcc 4.7"

* commit '05cd296e713377c216a4ac5b2d421f4ca0343cda':
  libmedia: Fix build with gcc 4.7