am 017fedbb: Merge "Fix a few issues in MediaMuxerTest."

* commit '017fedbb857f083dc71be4103ed3a41b584b80c4':
  Fix a few issues in MediaMuxerTest.