Remove second copy of apache code. Depend on unified email for these classes.

Change-Id: Ibe3e18b8e38389bff7f0e3a3479b660b97f94c7e
176 files changed