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

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