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

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