Merge "Use the new version of android_fork_execvp_ext()"