merge from open-source master

Change-Id: I4ea9aa2765cb634382da92ff17f5af9e2f6b4078
diff --git a/core/main.mk b/core/main.mk
index 4caae0f..cd7e718 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -752,7 +752,7 @@
 modules:
 	@echo "Available sub-modules:"
 	@echo "$(call module-names-for-tag-list,$(ALL_MODULE_TAGS))" | \
-	      sed -e 's/  */\n/g' | sort -u | $(COLUMN)
+	      tr -s ' ' '\n' | sort -u | $(COLUMN)
 
 .PHONY: showcommands
 showcommands: