Merge "base: remove Errorf/ErrnoErrorf work around"