am 96deb3b2: Merge "emulator opengl: Create and destroy Surfaces"

* commit '96deb3b2c85508cc166097fea92b20326a3f94f9':
  emulator opengl: Create and destroy Surfaces