Merge "adbd handles $TMPDIR now."