fix reboot recovery

Change-Id: Ib6462763f17fcd2bd235ad93a8e80496db67eb3d
fix C lang # break

Change-Id: Ia17e5db4387b493c6472dec560bfe1c1e291c3af
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1
Revert "ota_from_target_files: remove applypatch and recovery"

This reverts commit 6dc819defa2a99973577e693c21c88d14dabe2df.