am 8954fb1f: Reconcile with jb-release nakasi-factoryrom-release

* commit '8954fb1f92d25be2b0f111f5d83a1ef311b8d579':
  Fix static track activity ref counting
  Don't allow AudioTrack frameCount to decrease
  Fix race in AudioTrack destruction
  AudioFlinger: fix tracks ready for mixing logic.
  Fix regression in AudioTrack::pause()
  Fix ToneGenerator regression