Merge "allow setting opengles property"
am: 4feec6ddb8  -s ours

Change-Id: I67c2a9060e8545b13ced8a40c373bae7dda665d0