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