Merge changes Ic1be7572,Id6481430

* changes:
  Pass --ninja to makeparallel for ninja
  makeparallel: improve support for wrapping ninja