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

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

Change-Id: I2398d48876051edfd53aa288085bdfda115bdb86