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