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

* commit '640ce0abae5615a1913acdbed109a7b7d1ab7aa5':
  Revert "fix optimizing gtests"