Merge "otautil: #include <errno.h> for TEMP_FAILURE_RETRY." am: 1bf842471c
am: 7861ec16a0

Change-Id: Ia53a4fb2ca871cb688ca52902b4790e28531dc05