Revert "fix optimizing gtests"

This reverts commit 69dcf64251d70f616ae6c435d4788545130d42f0.

Change-Id: I1e01c17a3aa8b001ad5659260802e5f5073bf14e
2 files changed