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
Automatic translation import 

Change-Id: I3edf1d7aa883b66e559ccc1be192df59d7c5c935
Merge "Skip recovery-from-boot.p; fix build" into cm-11.0
Automatic translation import

Change-Id: I1c99288c409fc302d9fc32eadaccb11297dd193e
Automatic translation import

Change-Id: I22261b87d2f09461e42c732f17368010ab6b04d5
Automatic translation import 

Change-Id: I64cfaa28b714f94442aaa5286d686b3fe9e62430