Change Email2's build

Now Email2 is not being built as an override package, and
the package is not being renamed

Change-Id: I2f7b08165cef19c24084942f4ee11c8d401a2ca8
3 files changed