am 43590eb7: am 4f0002e6: Merge "MediaMuxer sample code update, no functional...
am 43590eb7: am 4f0002e6: Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev
* commit '43590eb7':
MediaMuxer sample code update, no functional change