Merge "Remove usages of jill.jar, use jack instead" into nyc-dev