Merge "allow qemu_props to set opengles.version" am: c5a33b0570 am: c6c5b1a969
am: 58ddb6d8e8

* commit '58ddb6d8e8e66e94594a26bbed9679a2bef2a6db':
  allow qemu_props to set opengles.version