Merge "Fix mac build" into main am: 4d2f5cd0cd am: 73ff4d820b am: 323cb0cc2d am: 3fba2f7ec9 am: dabafe38c7

Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2725953

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