Merge "JDWP: fix method argument count"