Merge "Fix dx.bat to match the new SDK structure." into jb-mr2-dev