Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1