Revert "Merge "Simplify AudioTrack stream end and fix race" into klp-dev"

This reverts commit 2f55c2c03b17795e94b325d402ac5b409e3ba0e8, reversing
changes made to 5874615f26a6ba9cda8ba359e5035b21f6e3818b.