Update mailmap

Change-Id: I6b6530841f242829d394998a6dfd85b34e04f232
Merge "Update mailmap"