am 25d34e2a: Merge "Use the new version of android_fork_execvp_ext()"

* commit '25d34e2af21e7a34f01eef25df94be73995cb7fc':
  Use the new version of android_fork_execvp_ext()