Merge changes I84e4f878,I37b65eb9

* changes:
  Parallelize system*.img and target-files-package
  Add missing dependencies of targets-files-package