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 am: b99b6dd1

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



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