Update the mailmap

Change-Id: Ifa5c765cabf38173d4a7442bdeac79dd15dbb79d
Merge "Update the mailmap"