Merge "AudioFlinger: Extract inner TrackHandle and RecordHandle classes"