Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"