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

Change-Id: I1d7add44554ebc4b68dc09debdd0c0fb229061a9
Merge branch 'cyanogenmod/cm-11.0' into cm11.0

Conflicts:
	tools/releasetools/ota_from_target_files

Change-Id: I465599b2e3dcc96066fc7d18b32be84eee4f26f2