Revert "Move some contact editor functionality into new base classes"

This reverts commit 5d1c571dbe5b4a60aec6cb81d69e9e595813268e.

Change-Id: Ia9df02198b460529c157fbee6012349b0eca0bf3
8 files changed