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

Change-Id: I2587f8fb3251efb54e28bc64bab8106ca1339381