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

Change-Id: Ia286dada4e21b31bdc320c6455f66606715d9c7c