Fix coverage report for newer versions of coverage

With newer versions of coverage (at least what is installed with ubuntu
trusty), code coverage isn't working.  Making this change allows the
coverage library to find the swift package.

Change-Id: I3b3792622904a86096064c0e03c8095636f83973
Merge "Fix coverage report for newer versions of coverage"
Update mailmap for Morgan Fainberg

Change-Id: Ia46c28c86ef3f440556b1b027d2bf0a7f3e721c5