Update mailmap

Update mailmap to reflect new email address that I will be committing
under

Change-Id: I9f8610ad982ed678c0b367b3a1768578739b2543
Merge "Update mailmap"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp