Revert "import ime from cm"

This reverts commit 9f0f61f4b87be07990f545113b946a8663d87805.

Conflicts:
	default.xml

Change-Id: I8871a25a4f5ebf5d7235b734fe38b6e68ae0b688
update local manifest

Change-Id: Ied36ba1e949a0445573f90aa38241225cffa2586