Merge change 20363 into donut

* changes:
  Make android.bat copy commons-compress to tmp with the other jar files.