Merge "base: remove Errorf/ErrnoErrorf work around" am: b9ac1178aa

Change-Id: I66fea07333752e2c149dba8963c583cf72d781de