Merge "Remove the obsolete logic in img_from_target_files.py."