Merge cherrypicks of [5218459, 5218501, 5218365] into studio-3.2-release

Change-Id: Ife4228962a26359ca4b87c983c8215e8fc1d989c
diff --git a/base/dependencies.properties b/base/dependencies.properties
index 0f21e2b..aeff8b0 100644
--- a/base/dependencies.properties
+++ b/base/dependencies.properties
@@ -52,7 +52,7 @@
 # To change the version used by test project, update TestUtils.KOTLIN_VERSION_FOR_TESTS
 kotlin_gradle_plugin = org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.0
 kotlin_reflect = org.jetbrains.kotlin:kotlin-reflect:1.2.0
-kotlin_stdlib = org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.0
+kotlin_stdlib = org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71
 kotlin_test = org.jetbrains.kotlin:kotlin-test:1.2.0
 kxml = net.sf.kxml:kxml2:2.3.0
 proguard = net.sf.proguard:proguard-gradle:6.0.3