Merge "Don't hard code the number of buffers for SurfaceMediaSource" into jb-mr1-dev