Merge "Move to newer clang annotations"
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 3d5c483..ed1339a 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -288,8 +288,10 @@
# Tests that are broken with GC stress.
# 137-cfi needs to unwind a second forked process. We're using a primitive sleep to wait till we
# hope the second process got into the expected state. The slowness of gcstress makes this bad.
+# 955-lambda-smali temporarily disabled b/22665783
TEST_ART_BROKEN_GCSTRESS_RUN_TESTS := \
- 137-cfi
+ 137-cfi \
+ 955-lambda-smali
ifneq (,$(filter gcstress,$(GC_TYPES)))
ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),$(PREBUILD_TYPES), \