Move CAF strings

Change-Id: Iab6288057e987cac866f6716761254e0329dd660
Merge branch 'cm' into HEAD

Conflicts:
	res/xml/device_info_settings.xml

Change-Id: I4428fa9537c2d5e2fdae5661699c4b12ac142994