diff --git a/SDKLauncher-Android/app/build.gradle b/SDKLauncher-Android/app/build.gradle
index 076e2b23..3ef81dec 100644
--- a/SDKLauncher-Android/app/build.gradle
+++ b/SDKLauncher-Android/app/build.gradle
@@ -1,21 +1,26 @@
 def ndk_experimental = (rootProject.hasProperty("readium_ndk_experimental") && rootProject.readium_ndk_experimental)
 
+println "[[${project.name}]] (APP) Gradle Experimental: ${ndk_experimental}"
+
 if (ndk_experimental) {
-    println "${project.name}: Using Gradle EXPERIMENTAL to build application"
     apply from: 'build_experimental.gradle'
 } else {
-    println "${project.name}: Using Gradle STABLE to build application"
     apply from: 'build_stable.gradle'
 }
 
-
 repositories {
+    if (!ndk_experimental) {
+        google()
+    }
+    maven {
+        url "https://maven.google.com"
+    }
     mavenCentral()
     jcenter()
+    maven { url 'https://maven.fabric.io/public' }
     flatDir {
         dirs '../libs'
     }
-    maven { url 'https://maven.fabric.io/public' }
 }
 
 dependencies {
@@ -56,18 +61,22 @@ buildAssets.dependsOn "buildCssAssets",
 apply from: 'build_epubReadingSystem.gradle'
 
 tasks.whenTaskAdded { task ->
-    def taskName = task.name
+    println "[[${project.name}]] (APP) TaskAdded: ${task.name}"
+
+    if (task.name.startsWith("compile")) {
+        def isDebug = task.name.toLowerCase().contains("debug")
 
-    if (taskName.startsWith("compile")) {
         if (ndk_experimental) {
             task.dependsOn "buildAssets",
-                    ":lcp:build",
-                    "buildEpubReadingSystem"
+                isDebug ? ":lcp:assembleDebug" : ":lcp:assembleRelease",
+                "buildEpubReadingSystem"
         } else {
-            println("Task: ${taskName}")
             task.dependsOn "buildAssets",
-                    ":epub3:buildMk",
-                    "buildEpubReadingSystem"
+                isDebug ? ":lcp:assembleDebug" : ":lcp:assembleRelease",
+                "buildEpubReadingSystem"
         }
     }
-}
\ No newline at end of file
+}
+gradle.buildFinished { buildResult ->
+    println "[[${project.name}]] (APP) buildFinished"
+}
diff --git a/SDKLauncher-Android/app/build_experimental.gradle b/SDKLauncher-Android/app/build_experimental.gradle
index a3edd4fb..d2c19491 100644
--- a/SDKLauncher-Android/app/build_experimental.gradle
+++ b/SDKLauncher-Android/app/build_experimental.gradle
@@ -11,7 +11,11 @@ def store_password =  (rootProject.hasProperty("readium_sign_store_password") ?
 
 def lcpDir = project(':lcp').projectDir
 def epub3Dir = project(':epub3').projectDir
+def rsdkDir = project(':rsdk').projectDir
 
+def _buildTypes = []
+def _productFlavors = []
+def currentBuildType
 model {
     android.lintOptions {
         checkReleaseBuilds = false
@@ -35,8 +39,8 @@ model {
     }
 
     android {
-        compileSdkVersion = 26
-        buildToolsVersion = "27.0.3"
+        compileSdkVersion = 28
+        buildToolsVersion = "28.0.3"
 
         defaultConfig {
 
@@ -47,7 +51,7 @@ model {
             minSdkVersion.apiLevel = 19
 
             // manifest/uses-sdk@android:targetSdkVersion attribute in src/main/AndroidManifest.xml
-            targetSdkVersion.apiLevel = 26
+            targetSdkVersion.apiLevel = 28
 
             // manifest@android:versionCode attribute in src/main/AndroidManifest.xml
             versionCode 31
@@ -101,19 +105,105 @@ model {
         } //buildTypes
 
         productFlavors {
-            if (!ndk_skipARM)
-                create("arm") {
+            if (!ndk_skipARM && !ndk_skipX86) {
+                create('armeabi-v7a--arm64-v8a--x86--x86_64') {
                     ndk.with {
-                        abiFilters.add("armeabi-v7a")
+                        abiFilters.add('armeabi-v7a')
+                        abiFilters.add('arm64-v8a')
+                        abiFilters.add('x86')
+                        abiFilters.add('x86_64')
                     }
                 }
-
-            if (!ndk_skipX86)
-                create("x86") {
-                    ndk.with {
-                        abiFilters.add("x86")
+            } else {
+                if (!ndk_skipARM) {
+                    create('armeabi-v7a--arm64-v8a') {
+                        ndk.with {
+                            abiFilters.add('armeabi-v7a')
+                            abiFilters.add('arm64-v8a')
+                        }
+                    }
+                }
+                if (!ndk_skipX86) {
+                    create('x86--x86_64') {
+                        ndk.with {
+                            abiFilters.add('x86')
+                            abiFilters.add('x86_64')
+                        }
                     }
                 }
+            }
         } //productFlavors
     } //android
-} //model
\ No newline at end of file
+
+    components.android {
+        binaries.afterEach { binary ->
+            println "[[${project.name}]] (APP) components.android.binaries buildType: ${binary.getBuildType().name}"
+            if (!_buildTypes.contains(binary.getBuildType().name)) {
+                println "[[${project.name}]] (APP) components.android.binaries buildType ADDED"
+                _buildTypes += binary.getBuildType().name
+            }
+
+            binary.getProductFlavors().each { flavor ->
+                println "  [[${project.name}]] (APP) components.android.binaries productFlavor: ${flavor.name}"
+                if (!_productFlavors.contains(flavor)) {
+                    println "  [[${project.name}]] (APP) components.android.binaries productFlavor ADDED"
+                    _productFlavors += flavor
+                }
+
+                flavor.ndk.abiFilters.each { abiFilter ->
+                    println "    [[${project.name}]] (APP) components.android.binaries abiFilter (${abiFilter})"
+                }
+            }
+            // binary.mergedNdkConfig.cppFlags.add("-DVARIANT=\"" + binary.name + "\"")
+        }
+    }
+} //model
+
+gradle.taskGraph.whenReady { taskGraph ->
+    println "[[${project.name}]] (APP) taskGraph ready"
+
+    // taskGraph.getAllTasks().last().finalizedBy("copyLibs")
+    // taskGraph.getAllTasks().last().doLast "copyLibs"
+    taskGraph.getAllTasks().last().doLast {
+        println "[[${project.name}]] (APP) last TASK (${currentBuildType})"
+    } // .dependsOn "copyLibs"
+
+    if (taskGraph.hasTask(buildRelease)) {
+        println "[[${project.name}]] (APP) taskGraph RELEASE (build)"
+
+        currentBuildType = "release"
+    } else if (taskGraph.hasTask(buildDebug)) {
+        println "[[${project.name}]] (APP) taskGraph DEBUG (build)"
+
+        currentBuildType = "debug"
+    } else {
+        if (taskGraph.hasTask(assembleRelease)) {
+            println "[[${project.name}]] (APP) taskGraph RELEASE (assemble)"
+
+            currentBuildType = "release"
+        }
+        if (taskGraph.hasTask(assembleDebug)) {
+            println "[[${project.name}]] (APP) taskGraph DEBUG (assemble)"
+
+            currentBuildType = "debug"
+        }
+    }
+}
+
+task buildRelease(type: GradleBuild, dependsOn: build) {
+}
+
+task buildDebug(type: GradleBuild, dependsOn: build) {
+}
+
+// task assembleRelease(type: GradleBuild, dependsOn: assemble) {
+// }
+
+// task assembleDebug(type: GradleBuild, dependsOn: assemble) {
+// }
+
+// tasks.all { task ->
+//     if (task.name.startsWith('compile') && task.name.endsWith('Ndk')) {
+//         task.enabled = false
+//     }
+// }
diff --git a/SDKLauncher-Android/app/build_stable.gradle b/SDKLauncher-Android/app/build_stable.gradle
index c1a8819f..460153dd 100644
--- a/SDKLauncher-Android/app/build_stable.gradle
+++ b/SDKLauncher-Android/app/build_stable.gradle
@@ -9,10 +9,21 @@ def store_password =  (rootProject.hasProperty("readium_sign_store_password") ?
 
 def lcpDir = project(':lcp').projectDir
 def epub3Dir = project(':epub3').projectDir
+def rsdkDir = project(':rsdk').projectDir
 
+println "[[${project.name}]] (APP) Skip ARM: ${ndk_skipARM}"
+println "[[${project.name}]] (APP) Skip x86: ${ndk_skipX86}"
+
+def currentBuildType
 android {
-    compileSdkVersion = 26
-    buildToolsVersion = "27.0.3"
+    applicationVariants.all { variant ->
+        println "[[${project.name}]] (APP) libraryVariant buildType: ${variant.buildType.name}"
+
+        // currentBuildType = variant.buildType.name
+    }
+
+    compileSdkVersion = 28
+    buildToolsVersion = "28.0.3"
 
     lintOptions {
         checkReleaseBuilds = false
@@ -40,7 +51,7 @@ android {
         minSdkVersion 19
 
         // manifest/uses-sdk@android:targetSdkVersion attribute in src/main/AndroidManifest.xml
-        targetSdkVersion 26
+        targetSdkVersion 28
 
         // manifest@android:versionCode attribute in src/main/AndroidManifest.xml
         versionCode 31
@@ -62,24 +73,54 @@ android {
 
             jniLibs {
                 dependencies {
-                    project ":epub3"
+                    // project ":rsdk"
                     project ":lcp"
                 }
+                // srcDirs = [
+                //     "${epub3Dir}/jniLibs/RELEASE",
+                //     "${lcpDir}/jniLibs/RELEASE",
+                //     "${epub3Dir}/jniLibs/DEBUG",
+                //     "${lcpDir}/jniLibs/DEBUG"
+                // ]
+            } //jniLibs
+        } //main
+
+        debug {
+            jniLibs {
                 srcDirs = [
-                    "${epub3Dir}/libs",
-                    "${lcpDir}/libs"
+                        // "${epub3Dir}/jniLibs/DEBUG",
+                        "${lcpDir}/jniLibs/DEBUG"
                 ]
             } //jniLibs
-        } //main
+        } //debug
+
+        release {
+            jniLibs {
+                srcDirs = [
+                        // "${epub3Dir}/jniLibs/RELEASE",
+                        "${lcpDir}/jniLibs/RELEASE"
+                ]
+            } //jniLibs
+        } //release
     } //sourceSets
 
     buildTypes {
         debug {
+//            sourceSets.main.jniLibs.srcDirs = [
+//                // "${epub3Dir}/jniLibs/DEBUG",
+//                "${lcpDir}/jniLibs/DEBUG"
+//            ]
+
             ext.enableCrashlytics = false
 
             minifyEnabled = false
         }
         release {
+//            sourceSets.main.jniLibs.srcDirs = [
+//                // "${epub3Dir}/jniLibs/RELEASE",
+//                "${lcpDir}/jniLibs/RELEASE"
+//            ]
+
             ext.enableCrashlytics = false
 
             minifyEnabled = false
@@ -92,27 +133,96 @@ android {
         }
     } //buildTypes
 
+    flavorDimensions "version"
     productFlavors {
-        if (!ndk_skipARM)
-            "arm" {
-                /*dependencies {
-                    compile('org.readium.sdk.lcp:liblcp-armeabi-v7a@aar')
-                }*/
-
+        if (!ndk_skipARM && !ndk_skipX86) {
+            'armeabi-v7a--arm64-v8a--x86--x86_64' {
+                dimension "version"
                 ndk.with {
-                    abiFilters = ["armeabi-v7a"]
+                    abiFilters = ['armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64']
                 }
             }
-
-        if (!ndk_skipX86)
-            "x86" {
-                /*dependencies {
-                    compile('org.readium.sdk.lcp:liblcp-x86@aar')
-                }*/
-
-                ndk.with {
-                    abiFilters = ["x86"]
+        } else {
+            if (!ndk_skipARM) {
+                'armeabi-v7a--arm64-v8a' {
+                    dimension "version"
+                    ndk.with {
+                        abiFilters = ['armeabi-v7a', 'arm64-v8a']
+                    }
                 }
             }
+            if (!ndk_skipX86) {
+                'x86--x86_64' {
+                    dimension "version"
+                    ndk.with {
+                        abiFilters = ['x86', 'x86_64']
+                    }
+                }
+            }
+        }
     } //productFlavors
 } //android
+
+// task sourceSetJniLibsSrcDirs {
+//     doFirst {
+//         println ("sourceSetJniLibsSrcDirs: ${currentBuildType}")
+//         android.sourceSets.jniLibs.srcDirs = [
+//             "${epub3Dir}/libs/${currentBuildType.toUpperCase()}",
+//             "${lcpDir}/libs/${currentBuildType.toUpperCase()}"
+//         ]
+//     }
+// }
+
+// tasks.whenTaskAdded { task ->
+//     def taskName = task.name
+
+//     if (taskName.startsWith("compile")) {
+//         task.dependsOn "sourceSetJniLibsSrcDirs"
+//     }
+// }
+
+// dependencies {
+//     compile project(":lcp")
+// }
+
+gradle.taskGraph.whenReady { taskGraph ->
+    println "[[${project.name}]] (APP) taskGraph ready"
+
+    // taskGraph.getAllTasks().last().finalizedBy copyLibs
+    taskGraph.getAllTasks().last().doLast {
+        println "[[${project.name}]] (APP) last TASK (${currentBuildType})"
+    } // .dependsOn copyLibs
+
+    if (taskGraph.hasTask(buildRelease)) {
+        println "[[${project.name}]] (APP) taskGraph RELEASE (build)"
+
+        currentBuildType = "release"
+    } else if (taskGraph.hasTask(buildDebug)) {
+        println "[[${project.name}]] (APP) taskGraph DEBUG (build)"
+
+        currentBuildType = "debug"
+    } else {
+        if (taskGraph.hasTask(assembleRelease)) {
+            println "[[${project.name}]] (APP) taskGraph RELEASE (assemble)"
+
+            currentBuildType = "release"
+        }
+        if (taskGraph.hasTask(assembleDebug)) {
+            println "[[${project.name}]] (APP) taskGraph DEBUG (assemble)"
+
+            currentBuildType = "debug"
+        }
+    }
+}
+
+task buildRelease(type: GradleBuild, dependsOn: build) {
+}
+
+task buildDebug(type: GradleBuild, dependsOn: build) {
+}
+
+// task assembleRelease(type: GradleBuild, dependsOn: assemble) {
+// }
+
+// task assembleDebug(type: GradleBuild, dependsOn: assemble) {
+// }
diff --git a/SDKLauncher-Android/app/src/main/AndroidManifest.xml b/SDKLauncher-Android/app/src/main/AndroidManifest.xml
index fb236505..57635ff5 100644
--- a/SDKLauncher-Android/app/src/main/AndroidManifest.xml
+++ b/SDKLauncher-Android/app/src/main/AndroidManifest.xml
@@ -4,9 +4,9 @@
     android:versionCode="31"
     android:versionName="1.31" >
 
-    <uses-sdk
-        android:minSdkVersion="19"
-        android:targetSdkVersion="26" />
+    <!--<uses-sdk-->
+        <!--android:minSdkVersion="19"-->
+        <!--android:targetSdkVersion="28" />-->
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -20,7 +20,8 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true" >
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
diff --git a/SDKLauncher-Android/build.gradle b/SDKLauncher-Android/build.gradle
index 4786fdd0..a34bc5ef 100644
--- a/SDKLauncher-Android/build.gradle
+++ b/SDKLauncher-Android/build.gradle
@@ -1,51 +1,74 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    repositories {
-       jcenter()
-        maven { url 'https://maven.fabric.io/public' }
-    }
-    dependencies {
-
-        Properties properties = new Properties()
-        properties.load(rootProject.file('local.properties').newDataInputStream())
+Properties properties = new Properties()
+properties.load(rootProject.file('local.properties').newDataInputStream())
 
-        def ndkClang = properties.getProperty('readium.ndk_clang', "false")
-        ndkClang = (ndkClang == "true") ? true : false;
-        rootProject.ext.set('readium_ndk_clang', ndkClang)
+def ndkClang = properties.getProperty('readium.ndk_clang', "false")
+ndkClang = (ndkClang == "true") ? true : false;
+rootProject.ext.set('readium_ndk_clang', ndkClang)
 //        def ndk_clang = (rootProject.hasProperty("readium_ndk_clang") && rootProject.readium_ndk_clang)
 //        if (ndk_clang) environment 'READIUM_CLANG', 'true'
 
-        def ndkSkipX86 = properties.getProperty('readium.ndk_skipX86', "false")
-        ndkSkipX86 = (ndkSkipX86 == "true") ? true : false;
-        rootProject.ext.set('readium_ndk_skipX86', ndkSkipX86)
+def ndkSkipX86 = properties.getProperty('readium.ndk_skipX86', "false")
+ndkSkipX86 = (ndkSkipX86 == "true") ? true : false;
+rootProject.ext.set('readium_ndk_skipX86', ndkSkipX86)
 //        def ndk_skipX86 = (rootProject.hasProperty("readium_ndk_skipX86") && rootProject.readium_ndk_skipX86)
 //        if (ndk_skipX86) environment 'READIUM_SKIPX86', 'true'
 
-        def ndkSkipARM = properties.getProperty('readium.ndk_skipARM', "false")
-        ndkSkipARM = (ndkSkipARM == "true") ? true : false;
-        rootProject.ext.set('readium_ndk_skipARM', ndkSkipARM)
+def ndkSkipARM = properties.getProperty('readium.ndk_skipARM', "false")
+ndkSkipARM = (ndkSkipARM == "true") ? true : false;
+rootProject.ext.set('readium_ndk_skipARM', ndkSkipARM)
 //        def ndk_skipARM = (rootProject.hasProperty("readium_ndk_skipARM") && rootProject.readium_ndk_skipARM)
 //        if (ndk_skipARM) environment 'READIUM_SKIPARM', 'true'
 
-        def ndkExperimental = properties.getProperty('readium.ndk_experimental', "false")
-        ndkExperimental = (ndkExperimental == "true") ? true : false;
-        rootProject.ext.set('readium_ndk_experimental', ndkExperimental)
+def ndkExperimental = properties.getProperty('readium.ndk_experimental', "false")
+ndkExperimental = (ndkExperimental == "true") ? true : false;
+rootProject.ext.set('readium_ndk_experimental', ndkExperimental)
 //        def ndk_experimental = (rootProject.hasProperty("readium_ndk_experimental") && rootProject.readium_ndk_experimental)
 //        if (ndk_experimental) environment 'READIUM_EXPERIMENTAL', 'true'
 
-        def signKeyPassword = properties.getProperty('readium.sign_key_password', "na")
-        rootProject.ext.set('readium_sign_key_password', signKeyPassword)
+def signKeyPassword = properties.getProperty('readium.sign_key_password', "na")
+rootProject.ext.set('readium_sign_key_password', signKeyPassword)
 
-        def signStorePassword = properties.getProperty('readium.sign_store_password', "na")
-        rootProject.ext.set('readium_sign_store_password', signStorePassword)
+def signStorePassword = properties.getProperty('readium.sign_store_password', "na")
+rootProject.ext.set('readium_sign_store_password', signStorePassword)
+
+println "[[${project.name}]] (ROOT) Gradle Experimental: ${ndkExperimental}"
+println "[[${project.name}]] (ROOT) Skip ARM: ${ndkSkipARM}"
+println "[[${project.name}]] (ROOT) Skip x86: ${ndkSkipX86}"
+println "[[${project.name}]] (ROOT) Clang: ${ndkClang}"
+
+buildscript {
+    repositories {
+        Properties properties = new Properties()
+        properties.load(rootProject.file('local.properties').newDataInputStream())
+        def ndkExperimental = properties.getProperty('readium.ndk_experimental', "false")
+        ndkExperimental = (ndkExperimental == "true") ? true : false;
+
+        if (!ndkExperimental) {
+            google()
+        }
+        maven {
+            url "https://maven.google.com"
+        }
+        mavenCentral()
+        jcenter()
+        maven { url 'https://maven.fabric.io/public' }
+    }
+    dependencies {
+        Properties properties = new Properties()
+        properties.load(rootProject.file('local.properties').newDataInputStream())
+        def ndkExperimental = properties.getProperty('readium.ndk_experimental', "false")
+        ndkExperimental = (ndkExperimental == "true") ? true : false;
 
         if (ndkExperimental) {
-            //https://bintray.com/android/android-tools/com.android.tools.build.gradle-experimental/view
+            // https://bintray.com/android/android-tools/com.android.tools.build.gradle-experimental/view
+            // https://mvnrepository.com/artifact/com.android.tools.build/gradle-experimental?repo=google
+            // 0.11.1 fails https://stackoverflow.com/questions/47057160/
             classpath "com.android.tools.build:gradle-experimental:0.9.3"
         }
         
-        //https://bintray.com/android/android-tools/com.android.tools.build.gradle/view
-        classpath "com.android.tools.build:gradle:2.3.3"
+        // https://bintray.com/android/android-tools/com.android.tools.build.gradle/view
+        // https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
+        classpath "com.android.tools.build:gradle:3.4.1"
 
         classpath 'io.fabric.tools:gradle:1.+'
     }
@@ -53,6 +76,13 @@ buildscript {
 
 allprojects {
     repositories {
+        if (!ndkExperimental) {
+            google()
+        }
+        maven {
+            url "https://maven.google.com"
+        }
+        mavenCentral()
         jcenter()
         flatDir {
             dirs 'libs'
diff --git a/SDKLauncher-Android/gradle/wrapper/gradle-wrapper.properties b/SDKLauncher-Android/gradle/wrapper/gradle-wrapper.properties
index 9b328d61..9df3313e 100644
--- a/SDKLauncher-Android/gradle/wrapper/gradle-wrapper.properties
+++ b/SDKLauncher-Android/gradle/wrapper/gradle-wrapper.properties
@@ -3,7 +3,7 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-#https://services.gradle.org/distributions
-# GRADLE EXPERIMENTAL requires 3.3
-# GRADLE STABLE works with latest (4.4)
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
\ No newline at end of file
+# https://services.gradle.org/distributions
+# GRADLE EXPERIMENTAL requires 3.3 (the 4.1 + 0.11.1 combo fails, see https://stackoverflow.com/questions/47057160/ )
+# GRADLE STABLE works with latest 5.4.1
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
\ No newline at end of file
diff --git a/SDKLauncher-Android/project.properties b/SDKLauncher-Android/project.properties
index 667da871..1f72937a 100644
--- a/SDKLauncher-Android/project.properties
+++ b/SDKLauncher-Android/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-26
+target=android-28
 android.library.reference.1=../readium-sdk/Platform/Android
diff --git a/SDKLauncher-Android/settings.gradle b/SDKLauncher-Android/settings.gradle
index 0449b8ce..e81f3f4c 100644
--- a/SDKLauncher-Android/settings.gradle
+++ b/SDKLauncher-Android/settings.gradle
@@ -1,6 +1,11 @@
 include ':epub3'
+include ':rsdk'
+
 include ':lcp'
+
 include ':app'
 
 project(':epub3').projectDir = new File(rootProject.projectDir, '../readium-sdk/Platform/Android/epub3')
+project(':rsdk').projectDir = new File(rootProject.projectDir, '../readium-sdk/Platform/Android/lib')
+
 project(':lcp').projectDir = new File(rootProject.projectDir, '../readium-lcp-client/platform/android/lib')
diff --git a/clean.sh b/clean.sh
index d241bad4..46238f78 100755
--- a/clean.sh
+++ b/clean.sh
@@ -1,16 +1,12 @@
 #!/bin/sh
 
-rm -r SDKLauncher-Android/app/build
-rm -r SDKLauncher-Android/build
+rm -rf SDKLauncher-Android/app/build
+rm -rf SDKLauncher-Android/build
 
-rm -r readium-sdk/Platform/Android/epub3/include
+cd readium-sdk/Platform/Android/
+. ./clean.sh
+cd -
 
-rm -r readium-sdk/Platform/Android/build
-rm -r readium-sdk/Platform/Android/epub3/build
-# rm -r readium-sdk/Platform/Android/epub3/libs
-rm -r readium-sdk/Platform/Android/epub3/obj
-
-rm -r readium-lcp-client/platform/android/build
-rm -r readium-lcp-client/platform/android/lib/build
-# rm -r readium-lcp-client/platform/android/lib/libs
-rm -r readium-lcp-client/platform/android/lib/obj
+cd readium-lcp-client/platform/android/
+. ./clean.sh
+cd -
diff --git a/readium-lcp-client b/readium-lcp-client
index 9a33f286..0277d71d 160000
--- a/readium-lcp-client
+++ b/readium-lcp-client
@@ -1 +1 @@
-Subproject commit 9a33f286244368e8fa2dd6d0a1b0656a84217a2a
+Subproject commit 0277d71d9c44d006a45fb463bdc45902e6ab30a2
diff --git a/readium-sdk b/readium-sdk
index 47a2710a..41c079db 160000
--- a/readium-sdk
+++ b/readium-sdk
@@ -1 +1 @@
-Subproject commit 47a2710ae7ed6c59806f2a01b7fe62b1622ed503
+Subproject commit 41c079dbcf3c41c71c4a8eaf1e8199f924ffaaa2
diff --git a/readium-shared-js b/readium-shared-js
index 2f3444fb..28620de3 160000
--- a/readium-shared-js
+++ b/readium-shared-js
@@ -1 +1 @@
-Subproject commit 2f3444fb92df67dd2ac4bf9ec2f1cae2bf399a70
+Subproject commit 28620de318d0da4afed547002fd5ad2ed004a5c1