Merge "primary-hal: Fix double free of fds"