Merge "Libbase: NOLINT legacy unique_fd operator int"