Merge "fuzzer driver: more fd types"