am 7e1af37c: Merge change Ibe2085be into eclair

Merge commit '7e1af37c3148112d9c801272bfa6359a005baf6d' into eclair-plus-aosp

* commit '7e1af37c3148112d9c801272bfa6359a005baf6d':
  Fix issue 2153835: AudioFlinger: setParameters() can remain stuck if output thread is terminated.