Merge "Random HWASan cleanups." am: b34d313d17

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1830382

Change-Id: If9ace9c23ccaff70f9022ab090886f28ebc9a74c