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

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

Change-Id: I901564240485389fd40afd7a566ce89f837f1fa3