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

* commit '997c4c2a62fc6bf75a68e656bfc747075f374098':
  opengles emulator: handle window surface resize