Merge "Expose core EGL entry points to eglGetProcAddress"