Merge "[mtectrl] properly handle FD for -t"