Update mailmap

Change-Id: I7cc1c069aefca3f61328fa92d7366b5b755febaf
Merge "Update mailmap"