Merge "Use "$@" to preserve argument word breaks"
diff --git a/envsetup.sh b/envsetup.sh
index aa20380..c29b788 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1449,7 +1449,7 @@
 function make()
 {
     local start_time=$(date +"%s")
-    $MAKE_UTIL $@
+    $MAKE_UTIL "$@"
     local ret=$?
     local end_time=$(date +"%s")
     local tdiff=$(($end_time-$start_time))