Add timeout to Executor.wait

Test Plan: -

Reviewers: lydia

Reviewed By: lydia

Differential Revision: https://phabricator.locu.com/D6801