Goodbye OTAUpdater, hello OpenDelta !
Conflicts:
	res/xml/device_info_settings.xml
Fix build
Conflicts:
	src/com/android/settings/DeviceInfoSettings.java