Merge "libbinder: RPC tests - avoid goto"