Remap the emails of the committers

Some of the emails that the committers are using
aren't really the right target email, so lets remap
the committers commited 'email' into the right email
instead.

Change-Id: Ib9346c32b4a967401d0c8cc67379337015d8c4d9
Merge "Remap the emails of the committers"