am e3b1b9eb: Merge "Gut dalvik.system.TemporaryDirectory, which has nothing to do with setting java.io.tmpdir."

* commit 'e3b1b9ebaca89b9aaa583ba9953dfce579d32a16':
  Gut dalvik.system.TemporaryDirectory, which has nothing to do with setting java.io.tmpdir.