Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom