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