[GWP-ASan] [Android-Specific] Integrate upstream build changes. am: fdfd07773c

Original change: https://android-review.googlesource.com/c/platform/external/gwp_asan/+/1506201

Change-Id: I68ec2070cabc88cea12aedc51046a3dee993079c