diff --git a/frontend/device/android/device.lua b/frontend/device/android/device.lua
index 07b75cee9..5f49892fa 100644
--- a/frontend/device/android/device.lua
+++ b/frontend/device/android/device.lua
@@ -138,12 +138,6 @@ function Device:init()
 
     local event_map = dofile("frontend/device/android/event_map.lua")
 
-    if android.prop.is_tolino then
-        -- dpad left/right as page back/forward
-        event_map[21] = "LPgBack"
-        event_map[22] = "LPgFwd"
-    end
-
     self.input = require("device/input"):new{
         device = self,
         event_map = event_map,
@@ -354,12 +348,7 @@ function Device:retrieveNetworkInfo()
             return _("Connected to mobile data network")
         elseif type == C.ANETWORK_ETHERNET then
             return _("Connected to Ethernet")
-        elseif type == C.ANETWORK_BLUETOOTH then
-            return _("Connected to Bluetooth")
-        elseif type == C.ANETWORK_VPN then
-            return _("Connected to VPN")
         end
-        return _("Unknown connection")
     end
 end
 
diff --git a/platform/android/luajit-launcher b/platform/android/luajit-launcher
index 4af40b512..72f13d5c0 160000
--- a/platform/android/luajit-launcher
+++ b/platform/android/luajit-launcher
@@ -1 +1 @@
-Subproject commit 4af40b51273f445da90ee7a48a2410fd0590eaa4
+Subproject commit 72f13d5c0a1af8876a6e590bdc3e1080a222e7b4