Merge "[binder]: Correct the index for getReturnString" am: a340838895 am: 3a3ed21bac am: 218d4e6ce5
am: 22e91a5b8f

Change-Id: Ief9ebb3d80d134d964a3011141da0196c16f87fd