mailmap: update .mailmap

Change-Id: I20841bcaf29a6be44999a4ee33f2c85e2a41a27d
Merge "mailmap: update .mailmap"