Merge "Remove usages of jill.jar, use jack instead"
am: 01ba22a3d5

* commit '01ba22a3d52e5359256adcbbb2cf9aa85ed5df51':
  Remove usages of jill.jar, use jack instead