Merge "Remove JILL, JACK_JAR and JILL_JAR"