Merge "AudioFlinger: Remove naked track pointers"