am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture."

* commit '9bad32c3830e45615a6b71e3f80ca7b95ef638b5':
  Remove hidden API setSurfaceTexture.