am 4f4c7c22: am f8f448b3: Merge "Build with kati+ninja when USE_NINJA=true"

* commit '4f4c7c22284729d5c1a256590edd387e9d9798dd':
  Build with kati+ninja when USE_NINJA=true