am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled playback" into lmp-dev

* commit '42fc04ff4db20f2de12834818a73778ec9ede052':
  stagefright: do not allocate output buffers for tunneled playback