Merge remote-tracking branch 'milosremote/dev' into servicestart

app/build.gradle

@@ -50,7 +50,6 @@ android {
         buildConfigField "String", "BUILDVERSION", generateGitBuild()
 
         ndk {
-            abiFilters "armeabi-v7a", "x86", "armeabi", "mips"
             moduleName "BleCommandUtil"
         }
     }
@@ -152,7 +151,6 @@ dependencies {
     }
     compile 'org.slf4j:slf4j-api:1.7.12'
     compile 'com.jjoe64:graphview:4.0.1'
-    compile 'com.eclipsesource.j2v8:j2v8:3.1.6@aar'
     compile 'com.joanzapata.iconify:android-iconify-fontawesome:2.1.1'
     compile 'com.google.android.gms:play-services-wearable:7.5.0'
     compile 'junit:junit:4.12'

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java

@@ -1,7 +1,5 @@
 package info.nightscout.androidaps.plugins.OpenAPSAMA;
 
-import com.eclipsesource.v8.V8Object;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

gradle.properties

@@ -15,6 +15,4 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-
-android.useDeprecatedNdk=true
+# org.gradle.parallel=true