Merge "mediaplayer: keep more buffers with the BufferQueue"