Revert "Fix for gtest missing core classes."

This reverts commit fa5480de6eca7f43b147c696bdb2936dc48d75d7.

Change-Id: Ifa9851f4f90af6093ed0bca852c55b3026fcd554
2 files changed