Fixed building incrementals when "no separate recovery" is specified.

Change-Id: I1d7add44554ebc4b68dc09debdd0c0fb229061a9
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	tools/releasetools/ota_from_target_files

Change-Id: Ice0adb3e7eb7cbb7eca4d2020b7ed9d3b63d330c