drop this duplicate line for recovery
	modified:   tools/releasetools/ota_from_target_files
Merge remote-tracking branch 'origin/kitkat' into blood