Merge "Add extra EGL error checking" into jb-mr1-dev