Merge "Replace GTest options by proper preparers" am: 324e661a81 am: 2b68a64096 am: ea5f125c4b

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1843598

Change-Id: I526adc774905eb49be1c1ec5941712ccb5f97585