Merge "Fix MediaMuxerTest#testWebmOutput failure bug" into qt-dev
am: e445c2817a

Change-Id: I8d1faa846d34b5acde3b1a08f8c8ed49195598cf