am 1bc9dace: am 1c06aa5a: Merge "egl translator"

* commit '1bc9dace079857ef3be16658c0c11bf398fcd67d':
  egl translator