fix up restore_orig_vm_and_cleanup

Change-Id: I0bd7ba879b88ca67a90746710536fe0f1b2203e9