Merge "Add camera service support for SurfaceTexture." into honeycomb