Merge "EGL 1.5 cleanup eglGetPlatformDisplay"