am a084f2c7: am 0881ce18: Merge changes Ic1be7572,Id6481430

* commit 'a084f2c73b905ab4906eb5e7aad593bd6fa222e6':
  Pass --ninja to makeparallel for ninja
  makeparallel: improve support for wrapping ninja