Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1