Merge changes Ia5ce6870,I155654cd

* changes:
  Zip after add_img_to_target_files
  Allow add_img_to_target_files to work on a directory