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

Change-Id: I1d7add44554ebc4b68dc09debdd0c0fb229061a9
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0