Merge changes Iac9cc917,I8eed4b0d

* changes:
  TextureView: add setSurfaceTexture method
  SurfaceTexture: add GL context attach & detach