Clean up a little after the gtest 1.7.0 upgrade.

Change-Id: I320c7159131cb782ede1a3c5cd539b956f77f521
25 files changed