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

* commit '4ee774f322ad3292fcfbb3c120cf250643419425':
  Simplify AudioTrack stream end and fix race