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

Change-Id: I6b125d1780a72bb7e77f17f96bc0eff7e8ce689e