am 6c75ad21: Merge "Configure the SurfaceMediaSource to emit the same number of buffers" into jb-mr1-dev

* commit '6c75ad21705cde0a11f78c755dc70bdec76890e6':
  Configure the SurfaceMediaSource to emit the same number of buffers