am 7ed0fc9a: am 5bc21905: Merge "opengles emulator: fix glGetUnifrom"

* commit '7ed0fc9ab39f34b206ca21cc43a919c356d56ea1':
  opengles emulator: fix glGetUnifrom