am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-dev

* commit '2f55c2c03b17795e94b325d402ac5b409e3ba0e8':
  Simplify AudioTrack stream end and fix race