Merge branch 'master' into structured-data

# Conflicts:
#	build.gradle

build.gradle

@@ -1,18 +1,18 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-  repositories {
-    google()
-    jcenter()
-    mavenCentral()
-    maven { url "https://plugins.gradle.org/m2/" }
-  }
-  dependencies {
-    classpath 'com.android.tools.build:gradle:3.6.1'
-    classpath "com.hiya:jacoco-android:0.2"
-    classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
-    classpath 'org.codehaus.groovy:groovy-all:2.4.15'
-  }
+    repositories {
+        google()
+        jcenter()
+        mavenCentral()
+        maven { url "https://plugins.gradle.org/m2/" }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath "com.hiya:jacoco-android:0.2"
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
+        classpath 'org.codehaus.groovy:groovy-all:2.4.15'
+    }
 }
 
 allprojects {