Merge "Added VideoEditor reference to protected AudioTrack constructor"