Merge "base: add more error-checking overloads for unique_fd." am: 946f7d44c2
am: 2ba6e11a7c

Change-Id: I59468f8523460c50495117f21b1106b16d993ddc