fix argv and toString (v 2.4.1)

Change-Id: Id079b0850f28f8b9b907e86b7bbbc615cef089d1
Merge "fix argv and toString (v 2.4.1)"