fix settings build

Conflicts:
	src/com/android/settings/util/CMDProcessor.java
	src/com/android/settings/util/Helpers.java