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

* commit '276f4f432804ed50e966725cd6d98f8cdd5eba1c':
  opengles emulator: fix uniform name translation to apps