diff --git a/frontend/device/android/device.lua b/frontend/device/android/device.lua
index 8ab05e1c7..1157d141d 100644
--- a/frontend/device/android/device.lua
+++ b/frontend/device/android/device.lua
@@ -12,14 +12,14 @@ local function no() return false end
 
 local function canUpdateApk()
     -- disable updates on fdroid builds, since they manage their own repo.
-    return (android.getFlavor() ~= "fdroid")
+    return (android.prop.flavor ~= "fdroid")
 end
 
 local Device = Generic:new{
-    model = android.getProduct(),
+    isAndroid = yes,
+    model = android.prop.product,
     hasKeys = yes,
     hasDPad = no,
-    isAndroid = yes,
     hasEinkScreen = function() return android.isEink() end,
     hasColorScreen = function() return not android.isEink() end,
     hasFrontlight = yes,
@@ -141,7 +141,7 @@ function Device:retrieveNetworkInfo()
 end
 
 function Device:exit()
-    android.LOGI("Finishing main activity");
+    android.LOGI(string.format("Stopping %s main activity", android.prop.name));
     android.lib.ANativeActivity_finish(android.app.activity)
 end
 
@@ -171,6 +171,6 @@ local function getCodename()
 end
 
 android.LOGI(string.format("Android %s - %s (API %d) - flavor: %s",
-    android.getVersion(), getCodename(), Device.firmware_rev, android.getFlavor()))
+    android.prop.version, getCodename(), Device.firmware_rev, android.prop.flavor))
 
 return Device
diff --git a/platform/android/llapp_main.lua b/platform/android/llapp_main.lua
index 57c563c3f..2e83e2a31 100644
--- a/platform/android/llapp_main.lua
+++ b/platform/android/llapp_main.lua
@@ -25,5 +25,10 @@ A.execute("chmod", "755", "./zsync")
 C.setenv("TESSDATA_PREFIX", "/sdcard/koreader/data", 1)
 
 -- create fake command-line arguments
-arg = {"-d", file or "/sdcard"}
+if A.isDebuggable() then
+    arg = {"-d", file or "/sdcard"}
+else
+    arg = {file or "/sdcard"}
+end
+
 dofile(A.dir.."/reader.lua")
diff --git a/platform/android/luajit-launcher b/platform/android/luajit-launcher
index cdd4bd6a2..d33fd5209 160000
--- a/platform/android/luajit-launcher
+++ b/platform/android/luajit-launcher
@@ -1 +1 @@
-Subproject commit cdd4bd6a2ea60ecb96b0d9aeedfbb97263bbf1cf
+Subproject commit d33fd5209e79339ed7c6d65ea474543ac07f3b7c