am 34552f4c: am 584bcf8a: Merge "opengles emulator: fix shader/program info log functions"

* commit '34552f4cf8796a27666d7abbdaeff8a39a2bdbf3':
  opengles emulator: fix shader/program info log functions