Merge "Only use integer sanitizer for 64-bit linux builds" am: 1081ae8b80 am: 18e41447f1

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

Change-Id: I6774f0763c3b339ffc9a1e227add4d7a1d96a378