Merge "MediaSync: clean up configureAudioTrack and configureSurface." into mnc-dev