Update .mailmap

Change-Id: I9ea7398281fe57c02df74854ecac8431125638e0
Merge "Update .mailmap"