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

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

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