Merge "Revert "adb: Make HOME=/data/local/tmp""