Merge "libbinder: rpc java detach error code"