Fix dx.bat to match the new SDK structure.

(Cherry-picked from c26c1291743ce7877cf11f3dc73d6f0c240229f7)

Change-Id: I57a7678178fc58e2a101c9d86da5009c6ec4f6a0
diff --git a/dx/etc/dx.bat b/dx/etc/dx.bat
index ac14fe6..6f588c4 100755
--- a/dx/etc/dx.bat
+++ b/dx/etc/dx.bat
@@ -28,7 +28,8 @@
 

 rem Check we have a valid Java.exe in the path.

 set java_exe=

-call ..\tools\lib\find_java.bat

+if exist    ..\tools\lib\find_java.bat call    ..\tools\lib\find_java.bat

+if exist ..\..\tools\lib\find_java.bat call ..\..\tools\lib\find_java.bat

 if not defined java_exe goto :EOF

 

 set jarfile=dx.jar