Disable building recovery by deafult

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

Change-Id: I4433ccb210af284ef0d1ebfee7736c0b105cad2a
Disable recovery patch building

Change-Id: I0e657571bb81cf8407f4f6452b273a5c0628d3d1
Signed-off-by: Evan Anderson <evananderson@aospa.co>
Merge "Disable building recovery by deafult" into lollipop
Merge "Disable recovery patch building" into lollipop