Merge change 24751 into eclair

* changes:
  Windows SDK: add support for -J option to dx.bat