[GWP-ASan] Minor refactor of optional components. am: 4bab731be2 am: e993aea5cc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia03776e96424d24aefaa4b7726d697ab8a0826a1