Revert "Revert "Update edify_generator.py""

This reverts commit 19e02d946ec19b5bcf0d82f583755d9ef9d544e9.
Revert "Revert "Update ota_from_target_files""

This reverts commit 74dd040f0c577cdc15581dca09c66edb347fc876.