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

Change-Id: I4a933dc1d90dd5f6bc246d539790b71bac58a9d8