Use actual storage type for format message strings

Change-Id: I214120303bf6c12c297332fa314ce80bc686da46

Conflicts:
	core/java/com/android/internal/app/ExternalMediaFormatActivity.java
	core/res/res/values/cm_strings.xml
	core/res/res/values/symbols.xml
WIFI: Fix wimax teardown when wifi connected

Due to patch:
https://github.com/CyanogenMod/android_frameworks_base/commit/f769f4cbc2aaac8d9d49f9ff79a6fe0affc4ff6e

Change-Id: I18e5ced62c8e4976f7a6835ba8c593930dac0586