Merge "math.mk supports larger number comparison" into main am: 8e403a4c am:...

Merge "math.mk supports larger number comparison" into main am: 8e403a4c am: bf21ba4b am: 13ea96d7

Original change: https://android-review.googlesource.com/c/platform/build/+/2805773



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