Merge "Add Errorf and ErrnoErrorf" am: ebbe9e7391 am: a7c8b3c49f
am: b208032521

Change-Id: I95896b91f08b53174ddf18fad18e615b72c08634