am 65b0052a: Merge "Remove SurfaceControl.setPosition(int, int)"

* commit '65b0052a7473b73a18aef73460c9ebec77a2c2a0':
  Remove SurfaceControl.setPosition(int, int)