e542742e1d
To avoid undeleted tmp.XXXXXXXXX directories left in /tmp, and output unified style patch for later apply. Change-Id: I6069c3cf36e345e5101ae3cf884e647c1d42030e