Merge "adb: handle some edge cases with process environments." am: 80f3b0438d
am: 412f6aaead

* commit '412f6aaead3c414fe65e8a9ca129e3218d28f633':
  adb: handle some edge cases with process environments.