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

Change-Id: I5612bddcb6f0deeee68a02b5e54b6698f1ad7110