Merge "fix typo that prevented proper loging of EGL error code" into jb-mr1-dev