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

* commit 'b49454ac3958a3497e1a715cc3471805f14ab84a':
  opengles emulator: limit X11 configs some more