am b4956a51: am 1a01301b: Merge "Fix "dalvikvm -help"."

* commit 'b4956a51f7575b59faf01ceaa30e2ce4ab3432e2':
  Fix "dalvikvm -help".