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

Change-Id: I95c35f8a9e5ba384aebec03bb685536211f597f1