am a266c533: am 6f722d48: Merge "Fixed error in ApkBuilderTask for jar files with resources"

* commit 'a266c53361b7037107f6993230f9ac3c54d9bcf6':
  Fixed error in ApkBuilderTask for jar files with resources