Merge "SurfaceTexture: add updateTexImage synchronization" into jb-mr1-dev