am fe34006d: (-s ours) am 05cd296e: Merge "libmedia: Fix build with gcc 4.7"

* commit 'fe34006d6f2a3c984bcade2cbeb9aaaaef8cc29a':
  libmedia: Fix build with gcc 4.7