am 2257c1fd: am 3127d80b: Merge "opengles emulator: handle window surface resize"

* commit '2257c1fd9f7f9d057bdc811208e342483c59c935':
  opengles emulator: handle window surface resize