Merge "Revert "Enforce execve() restrictions for API > 28""