Perform Email2 upgrade at version 40.

 * DB was bumped to version 40 in 10.2, so make sure to upgrade.

Change-Id: I2c1631ce3ed6f0b64d9a45007a2e3f2259cd96b9
Merge branch 'Cyanogen/cm-11.0'