Adapt for DISABLE_DYNLOADING possibility also for Android

Change-Id: Iecc8c35b5b2235bc3408f2ecf3969317ac8bf679

cppunit/ios.patch

@@ -16,28 +16,3 @@
 -  rm -f conftest.*
 +  rm -f -r conftest.*
  fi
---- misc/build/cppunit-1.13.0/include/cppunit/plugin/TestPlugIn.h
-+++ misc/build/cppunit-1.13.0/include/cppunit/plugin/TestPlugIn.h
-@@ -106,7 +106,9 @@
-  * CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void);
-  * \endcode
-  */
-+#ifndef CPPUNIT_PLUGIN_EXPORTED_NAME
- #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTestPlugIn
-+#endif
- 
- /*! \brief Type of the function exported by a plug-in.
-  * \ingroup WritingTestPlugIn
-@@ -143,6 +143,12 @@
- #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
-   typedef char __CppUnitPlugInImplementMainDummyTypeDef
- 
-+// Actually this is for iOS where we build the cppunit tests libraries
-+// as plain archives and just link them statically into test fixture programs,
-+// and don't want any stinking duplicate main(), but shouldn't hurt for MacOSX either.
-+#elif defined(__APPLE__)
-+#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
-+  typedef char __CppUnitPlugInImplementMainDummyTypeDef
- // Unix
- #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER)
- #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \