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

* commit 'ec3cac82e27b77676d433471b607383e1af049bb':
  opengles emulator: fix glGetUnifrom