Index: /trunk/source/level-0/l0-cfm-support.lisp
===================================================================
--- /trunk/source/level-0/l0-cfm-support.lisp	(revision 15270)
+++ /trunk/source/level-0/l0-cfm-support.lisp	(revision 15271)
@@ -896,5 +896,9 @@
                        :unsigned-fullword *dlopen-flags*
                        :address))
-                #-(or freebsd-target solaris-target) (setq map handle)
+                #-(or freebsd-target solaris-target android-target) (setq map handle)
+                #+android-target (setq map
+                                       (if (%null-ptr-p handle)
+                                         handle
+                                         (pref handle :soinfo.linkmap)))
                 #+(or freebsd-target solaris-target)
                 (setq map
Index: /trunk/source/lisp-kernel/pmcl-kernel.c
===================================================================
--- /trunk/source/lisp-kernel/pmcl-kernel.c	(revision 15270)
+++ /trunk/source/lisp-kernel/pmcl-kernel.c	(revision 15271)
@@ -2156,10 +2156,5 @@
 xGetSharedLibrary(char *path, int mode)
 {
-#ifdef ANDROID
-  /* Hopefully temporary bug workaround */
-  return NULL;
-#else
   return dlopen(path, mode);
-#endif
 }
 #endif