Revert "remove duplicate line"

This reverts commit b0f9427f82e8a9aaed3dbf25a8a902f68e4783ff.
Revert "fix build"

This reverts commit de9a90bd06ce7672866e801ed44a982a0e1f9571.
Revert "ota: Allow devices to skip generation of recovery-from-boot.p"

This reverts commit a50b766d54c972790226e060e9f2718d5ab70743.