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