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

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

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