Merge "Correct the previous patch for test file subpaths in Checkstyle."