update mailmap

Reflect new email address that I will be committing under.

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