Merge "EGL: refactor and enforce clang-format"