Merge changes I29596f2e,I6b84fd84

* changes:
  Revert "Revert "Delete renderengine::Surface""
  Revert "Revert "Remove gl surfaces from DisplayDevice.""