Refactor now that these path constructions are always the same.

Test: N/A
Change-Id: I9556cc98f837e58e63c4fecc017a5cc678f2d1b8
1 file changed