Merge "SurfaceTexture: fix updateTexImage JNI"