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

* commit '77a85ebe1fc28f3af07ebefeea53fad778f442c0':
  Simplify AudioTrack stream end and fix race