Merge "Fix gtest Makefile rules with respect to chroot support."
am: ac1cec6eae

Change-Id: If36d25eb6bc3eb842cf326c62bd7abab1557f04f