Merge "Revert "Add libgtest_prod.""