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

* commit '80f3b0438d84fba3c36cc73cfef992032cd33eb0':
  adb: handle some edge cases with process environments.