Merge "Revert "Use AudioTrack::event_type not int in callback""