Email: Change the smtp normal port to 25.

The smtp normal port is 25 but not 587 which is STARTTLS port.

CRs-fixed: 626567

Change-Id: I231868bf0377de8599aced279cca6d412a4182da
Merge "Email: Change the smtp normal port to 25." into du44