fix broken line/old lines from merge

...

 Changes to be committed:
	modified:   tools/releasetools/ota_from_target_files