Exclude the last two bytes for the non-type1 Email file.

From 3GPP TS 31.102 4.4.2.13, if the file is not type 1
(as specified in EFPBR), the last two bytes of the email
should be exclude the E-mail Address.

Change-Id: I2dc595353a8498dc51a286c2a72fc7a82de81b5b