[automerger skipped] Change coverage dump to specify the output file instead of directory. am: 3f81e072da am: fcfca21b9f -s ours am: 6c2da13b2f -s ours
am skip reason: Change-Id I2d835856d7a1b6b1ded561eca923f455b39317e4 with SHA-1 05b1c06a91 is in history

Change-Id: I2b02b2664f93f7ca54703a2d981d474b57497fe7