Merge "adb: don't use setenv after forking."