Merge change 25692 into eclair

* changes:
  Fix a bug in processing jarfolders in ApkBuilder