Merge "ART: Fix gtest after GraphChecker CL"