Merge "aaudio: cleanup thread handling"