diff --git a/core/main.mk b/core/main.mk
index 37c580deac..815745b0b1 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -290,6 +290,7 @@ subdirs := \
 	dalvik/dexdump \
 	dalvik/libdex \
 	dalvik/tools/dmtracedump \
+	dalvik/tools/hprof-conv \
 	development/emulator/mksdcard \
 	development/tools/activitycreator \
 	development/tools/line_endings \
diff --git a/envsetup.sh b/envsetup.sh
index e817c07f9f..eeeaf4345b 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -975,7 +975,7 @@ function runtest()
 }
 
 # simple shortcut to the runtest.py command
-function runtest.py()
+function runtest_py()
 {
     T=$(gettop)
     if [ ! "$T" ]; then