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

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

Change-Id: I77af5c66ceb64d1d4591ffafced8e4d849b42a3c