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

Change-Id: Ide81cefbff571d6ba2651e6434db19fa1ec686b4