Merge "Change coverage dump to specify the output file instead of directory."
am: f0723588de

Change-Id: Icc1b87d3fcb318adc1b10569d0a60180452f0a5b