Merge remote-tracking branch 'origin/pedroc/android_e2e' into pedroc/android_e2e_dev

java/android/OlmLibSdk/build.gradle

java/android/OlmLibSdk/gradle.properties

java/android/OlmLibSdk/gradlew

java/android/OlmLibSdk/gradlew.bat

java/android/OlmLibSdk/olm-sdk/build.gradle

...k/src/androidTest/java/org/matrix/olm/OlmAccountTest.java

...k/src/androidTest/java/org/matrix/olm/OlmSessionTest.java

java/android/OlmLibSdk/olm-sdk/src/main/AndroidManifest.xml

...bSdk/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java

...bSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java

...bSdk/olm-sdk/src/main/java/org/matrix/olm/OlmMessage.java

...bSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java

java/android/OlmLibSdk/olm-sdk/src/main/jni/Android.mk

java/android/OlmLibSdk/olm-sdk/src/main/jni/Application.mk

java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.cpp

java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.h

java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h

java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.cpp

java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h

java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp