update .mailmap

Change-Id: Ibdad9607e4a046cb0c78b68ae4255679e17ff218
Merge "update .mailmap"