Merge changes I799532f7,I5cffa6eb

* changes:
  SurfaceTexture: fix a comment
  SurfaceTexture: remove getAllocator