am 1a9ad005: am 0a931f55: Merge "opengles emulator: fix uniform name translation to apps"

* commit '1a9ad005bd7e492a2aa48e8be1a281b1c621374c':
  opengles emulator: fix uniform name translation to apps