am 4dd5c377: am be8fbb8f: Merge "Remove unused field from MediaMuxer"

* commit '4dd5c37711f370af4c507eedd4c7d27ec35a2d64':
  Remove unused field from MediaMuxer