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

* commit 'c5a33b057071a0c2ea0374bbb28ba02ba2495aba':
  allow qemu_props to set opengles.version