update mailmap

Reflect new email address that I will be committing under.

Change-Id: I91d763f6020f6aa7a007417c341f952d1efd20c2
Merge "update mailmap"