Merge "emulator: remove opengles property"