Merge "Update Kotlin code to be beta 4 compatible" into studio-master-dev