Merge "adb: don\'t use setenv after forking." am: 5e15568c07
am: 7b74dc83e6

* commit '7b74dc83e6e3c81f534f4422c14402ecd04b9015':
  adb: don't use setenv after forking.