am 349149b5: Merge "Fix error trap in SurfaceTexture Client"

* commit '349149b52a424c212e33d165bc146bc0337ea4c4':
  Fix error trap in SurfaceTexture Client