Merge "Add NDK version of MediaMuxer"