Merge "Clean up ANGLE integration logic." into main am: 8650e89619

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

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