am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more...
am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev
* commit '1000d426':
DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"