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

Change-Id: Ie8b87bd13a324b9cc97b69a7a179e3e056919498