Merge "Correct the previous patch for test file subpaths in Checkstyle." am: e958ddb230 am: 36cea17013 am: a6381cac67
am: bc071ef404

Change-Id: I127dc8eed3e0bf93a927e5eccac44175498f1aee