Merge "Fix dalvikvm -help"