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

* commit '3389c10a1057038b213c85d5180f8199f956c0b8':
  emulator opengl: Create and destroy Surfaces