Merge "Fix double-wrapping of exceptions in remote AndroidFutures."