Merge "Make screenrecord use NdkMediaMuxer"