Merge "Refactor ForkExecvp to improve locking behaviour" am: 6aaedb0dca
am: 12d8d6343b

Change-Id: If3a108dc16b0aaa53803ae9f9f5d880c78f66b5e