Fix null assert blocking tool resolution, use ninja to align with flu…

Fix null assert blocking tool resolution, use ninja to align with flu… #52