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