Make tox shell wrapper a macro

No jobs changed.

Change-Id: Ia14e236ea83326d378568ba97e606b924a220179