Make project compilable after types enhancement

plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidPsiTreeChangePreprocessor.kt

@@ -64,7 +64,7 @@ public class AndroidPsiTreeChangePreprocessor : PsiTreeChangePreprocessor, Simpl
         val info = androidModuleInfo ?: return listOf()
 
         val fileManager = VirtualFileManager.getInstance()
-        return info.resDirectories.map { fileManager.findFileByUrl("file://" + it) }
+        return info.resDirectories.map { fileManager.findFileByUrl("file://" + it)!! }
     }
 
     private fun PsiFile.isLayoutXmlFile(): Boolean {

plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidRenameProcessor.kt

@@ -147,7 +147,7 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() {
             newName: String,
             allRenames: MutableMap<PsiElement, String>
     ) {
-        val oldName = field.getName()
+        val oldName = field.getName()!!
         val processor = ServiceManager.getService(field.getProject(), javaClass<AndroidUIXmlProcessor>())
         renameSyntheticProperties(allRenames, newName, oldName, processor)
     }