Merge "MediaMuxer: Fix a typo in java doc." into oc-mr1-dev am: 7dd0c6924e
am: e0ba566aae

Change-Id: Idb8cbe7ee53e8d3eb2cc59b6fc163f88adad4df0