Disable building recovery by deafult

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

Change-Id: I4433ccb210af284ef0d1ebfee7736c0b105cad2a
Merge "Disable building recovery by deafult" into lollipop