Skip recovery-from-boot.p; fix build

The build doesn't finish due to commit # 64558. It gets stuck in running
imgdiff -b /tmp/targetfiles-...
This flag skips the command that calls imgdiff.
This depends on: http://review.cyanogenmod.org/#/c/64780
Which has been merged.

Change-Id: Iab9e69578a58ec852e4682612b0a4b45ad1bb925
Merge "Skip recovery-from-boot.p; fix build" into cm-11.0
Merge branch 'cm-11.0' into kk_mkt