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

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



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