am 58de1289: am bc195b36: am 6fb36397: Merge "Use /ninja_build to mark ninja build."

* commit '58de128998237611b7b876a81e8fbdcb0c6525d5':
  Use $(OUT_DIR)/ninja_build to mark ninja build.