am 549629d3: Merge "Make sure stagefright -o terminates even if we\'re using a raw audio source (such as .wav pcm)" into gingerbread

Merge commit '549629d36690ac09498d0a9b2aac4ae4ceb7eead' into gingerbread-plus-aosp

* commit '549629d36690ac09498d0a9b2aac4ae4ceb7eead':
  Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)