This reverts commit c06e2a90.

#14371: Remove MainBuffer dump info from OpenSL
Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into android
#14818: Use MainBuffer as a reference in OpenSL implementation
#14371: Fill buffers with zeros in OpenSL when no audio to be played
#14371: Instantiate audio layer, add linking flags for OpenSL in sflpnoned
Merge branch 'integrate_opensl' into android
Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into android

        sip level harcoded to 5 because calling
        __system_property_get() from NDK generates a segfault...
#14399: fix codec path and package name for android
#14399: fix program path and configdir
#14650: stub dbus in manager class
#14598: specify APP_NAME log tag in daemon libraries

        sflphone has to embed the static version of the lib

              needed soon

#14598: Modify logger class to print in android logcat
#14617: make libsflphone a shared lib to export it to Android JNI

Conflicts:
	jni/Application.mk
	jni/sflphone

         fix libexpat and libssl dependencies

#13891: missing initTLS in TLS optional support

#14379: Remove alsa from preferences

Conflicts:
	jni/sflphone

#14480: Add Android.mk to hooks subfolder

#14476: Add Android.mk in history subfolder

#14464: Cross-compile audio subfolder