am aea3b581: Merge "Remove hidden API setSurfaceTexture."

* commit 'aea3b5816d8461fcbc4a384874a1a073ecdeafcf':
  Remove hidden API setSurfaceTexture.