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

Change-Id: Ia5f9719eaf8266c6701c78f4b4f3145d0a0cf7df