Merge "Revert "Support packaging class files into nested JAR when building""