Merge "Change coverage dump to specify the output file instead of directory." am: f0723588 am: a1e96c64 am: 59fc3398 Change-Id: I5612bddcb6f0deeee68a02b5e54b6698f1ad7110