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

Change-Id: I6e79d0eeb1bcb80e5e971698c7e130483eb0bad1