Merge "Abolish AutoCloseFD.h in favour of unique_fd"