Merge "adb: Make HOME=/data/local/tmp" am: 5358093225 am: 65ab87dd9b
am: b87df11678

* commit 'b87df11678c22d56d02c776f8f91031bf81a963d':
  adb: Make HOME=/data/local/tmp