Merge "[binder]: Correct the index for getReturnString" am: a340838895
am: 3a3ed21bac

Change-Id: I155907b463d85dee5327c1b1df47be6d6c5cc3c9