Revert "Use actual storage type of sdcard/usb (1/2)."

This reverts commit f41f1bec5d13621f0fe33668e035353cdc726200.

Conflicts:
	core/res/res/values/cm_public.xml

Change-Id: If5a0d8023b24cb9ebd050e151f3d054b6a34333f