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

* commit '8c33b952059aa3d9f9374106839ae9aec80ac471':
  Make USE_NINJA=true the default