am 9ff24387: Merge "Make USE_NINJA=true the default"

* commit '9ff24387c205da60e3d7deb042530b1d0b2d881c':
  Make USE_NINJA=true the default