Merge "base: remove Errorf/ErrnoErrorf work around" am: b9ac1178aa am: 2ef5b50b56 am: 96307c24dd

Change-Id: I8bedce0d4e4cec39b146f91319dc1df38339daac