Fix android tests

compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java

@@ -74,6 +74,7 @@ public class SpecialFiles {
         excludedFiles.add("invokeOnImportedEnum1.kt"); // Cannot change package name
         excludedFiles.add("invokeOnImportedEnum2.kt"); // Cannot change package name
         excludedFiles.add("sortEnumEntries.kt"); // Cannot change package name
+        excludedFiles.add("assertionStackTrace.kt"); // Cannot change package name
 
         excludedFiles.add("kt326.kt"); // Commented
         excludedFiles.add("kt1213.kt"); // Commented

compiler/testData/codegen/bytecodeText/storeStackBeforeInline/primitiveMerge.kt

@@ -4,7 +4,7 @@ fun foobar(x: Boolean, y: String, z: String) = x.toString() + y + z
 
 inline fun foo() = "-"
 
-fun box() {
+fun test() {
     val result = foobar(if (1 == 1) true else bar(), foo(), "OK")
 }