Simplify setting path to archive test reports

Change-Id: I90e32f2592a83379d3e59b01fdbdcf2865cc80b1
Merge "Simplify setting path to archive test reports"