Merge branch 'jeremiah-master' # Conflicts: # gradle/wrapper/gradle-wrapper.properties # sqlite-android/build.gradle # sqlitecustom/src/main/jni/Application.mk