DeviantX

Conflicts:
	tools/releasetools/ota_from_target_files