Merge "Benchmark: add Muxer" am: 47f98f62a9
am: 63ef1152a0

Change-Id: I93c5a9ea844072962a0b7e6f57ce7f68cc6d0567