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

Change-Id: I8dd9c92571c9ad919874049d1fd1e37cefe7d955