Merge "Rename emma coverage files"
am: f7e06ef

* commit 'f7e06ef3b40da7931cee62210f880b7cb00787ce':
  Rename emma coverage files

Change-Id: I39a861d672f754f1b3380838ad9b45d584f5c7a7