Merge changes I2ba90314,I5f47307d
Colin Cross authored
* changes:
  makeparallel: prepend flags to ninja command line
  Put NINJA_ARGS last
fc8b3318