Merge commit 'goog/readonly-p4-master'

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 \

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