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

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