Merge "Remove TimedAudioTrack and associated code"