ota_from_target_files: Remove recovery patch condition for block ota

We don't include recovery patch, but we still want to use block OTA

Change-Id: I48e06b8aaba627d27f2067a3b83a318ac5e96025
Signed-off-by: Evan Anderson <evananderson@aospa.co>
(cherry picked from commit 5a467c80fecf4c0d50dda2c3ee4f39e270df6726)
Disable building recovery by deafult

Gate building recovery behind the "--recovery". Builds shouldn't overwrite
a users recovery

Change-Id: I4433ccb210af284ef0d1ebfee7736c0b105cad2a

Conflicts:
	tools/releasetools/ota_from_target_files

(cherry picked from commit 446a6c85ad987afea1f3a8145467da37a85e95f3)

Conflicts:
	tools/releasetools/ota_from_target_files