Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1