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

This reverts commit 54e5aa5589d05fce844469e55f57e1d10fcbbc1b.

Conflicts:
	res/values/cm_strings.xml
V128.1
Settings: Improve touch sensivity string

Change-Id: I47cfb414af91657ed158b4010ffa0bbf21c0e8e9
Display: Default SRE to off

Facemelt mode is catching people by surprise and being interpreted
as "messed up colors". Default it to off so people can at least see
it kick in as a reaction to enablement

Change-Id: I5816e528363f508fc360c321c702a59f0bb79846
Build V129