mailmap: update mailmap file with some stray emails

Update to fix shortlog showing the right authors for commits that used
the wrong emails.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>