Merge "Fix incorrect error checking on unique_fd"
am: d2515c56d4

Change-Id: I731d55e1a0585f4a4d5677e9094e22d56bde4c56