Merge "Rename emma coverage files" into nyc-dev
am: 301d595

* commit '301d5955dabf12b6b0e0610cae5f87231f0dc1f1':
  Rename emma coverage files

Change-Id: Ib728bb5d633fc18cb21ea706142d8a51b813db36