Merge "Fix "dalvikvm -help"."