Merge "adbd handles $TMPDIR now."
am: ab3794bf03

Change-Id: Ie1fe55ee5a24278576867e97a32468bd450c2c55