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

Change-Id: I99619826f0919b0578099e2ab55691a37d9f8dc2