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

* commit '0a931f5580cffab446d5eef5d87308eb67234ae9':
  opengles emulator: fix uniform name translation to apps