Revert "Add option for switching between UMS and MTP/PTP mode. (2/2)"

This reverts commit 687a6126eab64c1938bfd3ee5f2ba814cceaadf4.

Signed-off-by: Paul Beeler <sparksco@gmail.com>

Conflicts:
	res/values/strings.xml
Multi pane preference settings

Signed-off-by: Paul Beeler <sparksco@gmail.com>

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/system_settings.xml
	src/com/android/settings/saber/SystemSettings.java