am 097ba88d: Merge change 20363 into donut

Merge commit '097ba88d5392ef4e5e104b5bcb73d511119a8fc6'

* commit '097ba88d5392ef4e5e104b5bcb73d511119a8fc6':
  Make android.bat copy commons-compress to tmp with the other jar files.