Merge "Set HOME, LOGNAME, SHELL, and USER from adbd." am: 36d7af4cf6
am: 5b51ac7a59

* commit '5b51ac7a5931c2e9c491c61233a6bbaba5edb6fa':
  Set HOME, LOGNAME, SHELL, and USER from adbd.