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

* commit '1a01301b838759188d6646ceac6c285335504b65':
  Fix "dalvikvm -help".