Merge changes I6e4f957c,Id41a2d81

* changes:
  Use makeparallel to propagate -j flag to ninja or kati
  Implement makeparallel