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

* commit '425d0248a1949208de7b715155ad0d6036c46bc1':
  Make USE_NINJA=true the default