Merge "test_util: add missing include for close()"