Merge "Loosen up the checks for test class paths in Checkstyle." am: 2c1ef76cc6 am: 46d5e59b93 am: 8d7d47941d
am: c2973bde08

Change-Id: Icf1b8527075cab901f65451123ebfd2893935c76