am 29a29875: Merge "Running jarjar on Java resources."

* commit '29a29875627758aa3c76aa5256641c1782c904bf':
  Running jarjar on Java resources.