[automerger skipped] Merge "[Cherry-pick] Clean up EGL Loader." into main am: bf8e3666a8 am: 1dfcd85da2 -s ours am: c77ccc54cd -s ours

am skip reason: Merged-In Ibc62bf59ed7b0cb3671583d2af853c457977d1d1 with SHA-1 d30aaadb8c is already in history

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

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