Merge "Remove warnings about mismatched types with builtins for stubs." am:...

Merge "Remove warnings about mismatched types with builtins for stubs." am: b69919c7 am: 755be611

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



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