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

Change-Id: I1d7add44554ebc4b68dc09debdd0c0fb229061a9
(cherry picked from commit dc4c402f284dfa346791d2f593df7bbdba278a36)