Merge "Do not force ARMv8-A." into main am: 0086bf194a

Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/3503752

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