Merge "Clean up ANGLE integration logic." into main am: 8650e896 am: b6e75fc0 am: e16d0604

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



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