Merge "Add Errorf and ErrnoErrorf"
am: ebbe9e7391

Change-Id: I2d748929f5db5a06aaa685f0ae8dba75bdae637e