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

* commit '9d06b8026d551c24527d6f72f134046d94068c46':
  stagefright: do not allocate output buffers for tunneled playback