am e6cb412b: am 33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev

* commit 'e6cb412b677966c25b424766dc6ceb2787d49caa':
  SurfaceMediaSource: keep refs to current buffers