Merge "Use exported gtest headers." am: 153632d430
am: bb9cd7ffe2

Change-Id: Iff46b60c8d519ecebe1cb95853b36db05e662a4d