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

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