Merge "Update api/current.xml for SurfaceTexture." into honeycomb