am 296c6cc2: Merge "Revert "fix optimizing gtests""

* commit '296c6cc2e5e90a81bdfc5f5486eae6b64d80e595':
  Revert "fix optimizing gtests"