am 8d1a6af4: Merge "fix typo introduced in SurfaceTextureClient to Surface renaming"

* commit '8d1a6af408d798dec46a8b1230b7327551fb8051':
  fix typo introduced in SurfaceTextureClient to Surface renaming