[fx2trt] Engineholder feature improvement, test fixes#1143

frank-wei merged 2 commits intomasterpytorch/TensorRT:masterfrom

fb-sync-wwei6pytorch/TensorRT:fb-sync-wwei6Copy head branch name to clipboard