Merge pull request #5008 from wintersandroid/master

Android library build script fixes, and Android thread lock on remote disconnect.

diff --cc client/Android/Studio/aFreeRDP/build.gradle
index 3c09359,c80fed0..f5facf9
--- 1/client/Android/Studio/aFreeRDP/build.gradle
--- 2/client/Android/Studio/aFreeRDP/build.gradle
+++ b/client/Android/Studio/aFreeRDP/build.gradle
@@@ -6,10 -6,10 +6,10 @@@ android 
  
      defaultConfig {
          applicationId "com.freerdp.afreerdp"
-         minSdkVersion 14
-         targetSdkVersion 27
+         minSdkVersion 21
+         targetSdkVersion 28
          vectorDrawables.useSupportLibrary = true
 -        versionCode = 14
 +        versionCode = 15
          versionName = rootProject.ext.versionName
      }
  

diff --cc client/Android/Studio/freeRDPCore/build.gradle
index 257ba48,332aa9a..7b641a0
--- 1/client/Android/Studio/freeRDPCore/build.gradle
--- 2/client/Android/Studio/freeRDPCore/build.gradle
+++ b/client/Android/Studio/freeRDPCore/build.gradle
@@@ -1,14 -1,14 +1,14 @@@
  apply plugin: 'com.android.library'
  
  android {
-     compileSdkVersion = 27
-     buildToolsVersion = "27.0.3"
+     compileSdkVersion = 28
+     buildToolsVersion = "28.0.3"
  
      defaultConfig {
-         minSdkVersion 14
-         targetSdkVersion 27
+         minSdkVersion 21
+         targetSdkVersion 28
          vectorDrawables.useSupportLibrary = true
 -        versionCode = 14
 +        versionCode = 15
          versionName = rootProject.ext.versionName
      }
  

diff --cc client/Android/android_freerdp.c
Simple merge