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

Change-Id: I25cf85cb124ee9b713b57c948442a6be728555d4