Update .mailmap

Change-Id: I5dc51c7aeb080945201376c42250502de601384a
Merge "Update .mailmap"