Move CAF strings

Change-Id: Iab6288057e987cac866f6716761254e0329dd660

Conflicts:
	res/values/cm_strings.xml

(cherry picked from commit 7ba09098c4beac18ec6e560819783f5f99e3ef30)