am 5b7aaeaa: am ed4b0eeb: Merge "Revert "Use @arg-lsit-file for jar in add-carried-jack-resources""

* commit '5b7aaeaa2e71cac30609263364082f33ce43bfbf':
  Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"