execv invocation fixes

Change-Id: I80e7100a834b7eca2d9c8560c221cffd41492f03