Merge "extfs support for img_from_target_files"