Merge "Update run-test 097-duplicate-method"

diff --cc test/Android.run-test.mk
index 74ec330,2097256..f30ce39
--- 1/test/Android.run-test.mk
--- 2/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@@ -218,14 -221,10 +218,12 @@@ ART_TEST_KNOWN_BROKEN += $(call all-run
          $(IMAGE_TYPES), $(PICTEST_TYPES), $(DEBUGGABLE_TYPES), $(ART_TEST_RUN_TEST_SKIP), $(ALL_ADDRESS_SIZES))
  
  
- # Disable 097-duplicate-method while investigation (broken by latest Jack release, b/27358065)
  # Disable 137-cfi (b/27391690).
  # Disable 577-profile-foreign-dex (b/27454772).
 +# Disable 117-nopatchoat for investigation (b/27689078).
  TEST_ART_BROKEN_ALL_TARGET_TESTS := \
-   097-duplicate-method \
    577-profile-foreign-dex \
 +  117-nopatchoat \
  
  ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),$(PREBUILD_TYPES), \
      $(COMPILER_TYPES), $(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES), \