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

Change-Id: I374723c81642c973d89a0646a8f2bbee3ebf1e9e