Merge "Stop defining __STDC_LIMIT_MACROS." into main am: f1863f6307 am: 2587f5c839

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2962171

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