Put all output files directly in the archive directory

Change-Id: Ifdbd12ef1c8f64eb883f30a90aacb096cb2e4422
1 file changed