am d2c5f503: Merge "opengles emulator: fix the uniform location WAR for intel platforms"

* commit 'd2c5f50354052223348aa9acbdaeea407b28d8f9':
  opengles emulator: fix the uniform location WAR for intel platforms