am 69ae2a4a: am b49454ac: Merge "opengles emulator: limit X11 configs some more"

* commit '69ae2a4ae2924257dc4e682641b0d409ad6c1caf':
  opengles emulator: limit X11 configs some more