Merge "Simplify Soong bootstrapping"
diff --git a/core/soong.mk b/core/soong.mk
index 4f15005..80dcefd 100644
--- a/core/soong.mk
+++ b/core/soong.mk
@@ -90,4 +90,4 @@
 # prebuilts.
 .PHONY: run_soong
 run_soong: $(SOONG_BOOTSTRAP) $(SOONG_VARIABLES) $(SOONG_IN_MAKE) FORCE
-	$(hide) $(SOONG) $(SOONG_BUILD_NINJA) $(NINJA_EXTRA_ARGS)
+	$(hide) SKIP_NINJA=true $(SOONG)