Use CM standard qcom naming

Change-Id: I360b3dcf1fe82140a7993189e881f9d77b571bef
ota: Generate recovery-from-boot.p file

This may be wanted to update the recovery with system updates

Change-Id: Iacd41be7a8018cbc08b2606485d446756910f506
Revert "fix"

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

This reverts commit 1b5803d2177fd895549a76631a3b13426fdf8f97.
Fixed building incrementals when "no separate recovery" is specified.

Change-Id: I1d7add44554ebc4b68dc09debdd0c0fb229061a9