Merge "Set $TMPDIR for `adb shell`." am: bf2062f800
am: f56800a5ea

Change-Id: If0baa786238a795a80095da547b8a1b17a3c0f69