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