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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd70b4d3274df05ac0251b2c92ff6594afb088e0