DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue" This reverts commit b635b0e66b257ab442e230bca96afd5105cf6829. Bug: 13655631