ota: Don't include recovery in otapackages.

Change-Id: Ia7b9a20aeac4414f2b7db2664cec5d867086d20b

Conflicts:
	tools/releasetools/ota_from_target_files
Fix procedure of writing boot image for htc bravo

Change-Id: I2084f6476fa45d6702b177e215c98db6ae324c15