am 7962ad6a: am 00c464ff: Merge change 24751 into eclair

Merge commit '7962ad6a3154d86026a17be952295bdec64f1118'

* commit '7962ad6a3154d86026a17be952295bdec64f1118':
  Windows SDK: add support for -J option to dx.bat