Merge "[Cherry-pick] Clean up EGL Loader." into main am: bf8e3666a8 am: 537531897a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2797319

Change-Id: I85aeada184d43d7e87dd4ec35c62c00bd4f2e6dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>