am 52dc2b9e: am 3fa3021e: am fb8c84d8: Merge "opengles emulator: Workaround Cordy (Unity) bug with intel driver."

* commit '52dc2b9eba80316e678957de64b54818f75de0c8':
  opengles emulator: Workaround Cordy (Unity) bug with intel driver.