Remove usages of jill.jar, use jack instead
am: 51e4d44178  -s ours

* commit '51e4d44178919bf717e58365ce52a3c852d28465':
  Remove usages of jill.jar, use jack instead