Merge change 26329 into eclair

* changes:
  Distinguish jar folders and jar files in ApkBuilder script