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

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