Merge "[Cherry-pick] Make sure the correct ANGLE binary is used." into main am: eafadb3b87 am: a8342f4b63

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

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