Add .mailmap file

Add a .mailmap file for git to use for cases where the same person has
commits with more than one name or email address.

Change-Id: I14c787ecc196b064a5d2c714d26ea1b854bb933e
Merge "Add .mailmap file"