Merge "EGL: fix the ANativeWindow size/fmt override"