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

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