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

Change-Id: I49c6aa7cdfa65e4e64cc2ab6f1b2b21fc478795b