Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."