Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev