am 7e6c75f5: am d211b488: Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1

* commit '7e6c75f5a57b42edf22ce4e2cf144016252066c5':
  SurfaceTexture: unhide setDefaultBufferSize