Remove dependency on emailcommon

Change-Id: I8933050833a598b274aaeb952f73aad3be9235eb
4 files changed