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

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

Change-Id: Ifb1931ed2b9c9188278c679ecce7b7930c4d5971