Snap for 4832339 from 19b1742614570b0debcdd13238917126924d321c to pi-release

Change-Id: Ie8d65ddd251352c57b4e2ee7a151693f218567dc
diff --git a/java/java.go b/java/java.go
index 619ae75..ddfb09a 100644
--- a/java/java.go
+++ b/java/java.go
@@ -806,6 +806,7 @@
 		}
 
 		// Make javac rule depend on the kotlinc rule
+		flags.classpath = append(flags.classpath, deps.kotlinStdlib...)
 		flags.classpath = append(flags.classpath, kotlinJar)
 		// Jar kotlin classes into the final jar after javac
 		jars = append(jars, kotlinJar)