Support for rebuilding root depth kotlin folder

- refs: #1703

brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java

@@ -303,7 +303,6 @@ public class Androlib {
         buildNonDefaultSources(appDir);
         buildManifestFile(appDir, manifest, manifestOriginal);
         buildResources(appDir, meta.usesFramework);
-        buildLib(appDir);
         buildLibs(appDir);
         buildCopyOriginalFiles(appDir);
         buildApk(appDir, outFile);
@@ -545,12 +544,10 @@ public class Androlib {
         }
     }
 
-    public void buildLib(File appDir) throws AndrolibException {
-        buildLibrary(appDir, "lib");
-    }
-
     public void buildLibs(File appDir) throws AndrolibException {
+        buildLibrary(appDir, "lib");
         buildLibrary(appDir, "libs");
+        buildLibrary(appDir, "kotlin");
     }
 
     public void buildLibrary(File appDir, String folder) throws AndrolibException {

brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java

@@ -528,6 +528,11 @@ public class BuildAndDecodeTest {
         compareBinaryFolder("/smali", false);
     }
 
+    @Test
+    public void confirmKotlinFolderPersistsTest() throws BrutException, IOException {
+        checkFolderExists("/kotlin");
+    }
+
     @SuppressWarnings("unchecked")
     private void compareUnknownFiles() throws BrutException, IOException {
         MetaInfo control = new Androlib().readMetaFile(sTestOrigDir);