Merge "Move lint unit tests into lint/cli"

540 files changed, 18 insertions, 18 deletions

diff --git a/lint/.gitignore b/lint/.gitignore
index bc2e6ff..efaf427 100644
--- a/lint/.gitignore
+++ b/lint/.gitignore
@@ -1,7 +1,7 @@
 cli/bin
 cli/build
+cli/src/test/bin
 libs/lint_api/bin
 libs/lint_api/build
 libs/lint_checks/bin
 libs/lint_checks/build
-libs/lint_checks/src/test/bin
diff --git a/lint/cli/Android.mk b/lint/cli/Android.mk
index 5f7da91..dcd1792 100644
--- a/lint/cli/Android.mk
+++ b/lint/cli/Android.mk
@@ -28,3 +28,16 @@ include $(BUILD_HOST_JAVA_LIBRARY)
 
 # Build all sub-directories
 include $(call all-makefiles-under,$(LOCAL_PATH))
+
+# Build tests
+include $(CLEAR_VARS)
+
+# Only compile source java files in this lib.
+LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java)
+
+LOCAL_MODULE := lint_checks-tests
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_JAVA_LIBRARIES := common sdklib lint_api lint_checks lint junit easymock asm-tools asm-tree-tools guava-tools layoutlib_api sdktestutils
+
+include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/lint/libs/lint_checks/src/test/.classpath b/lint/cli/src/test/.classpath
index 178cd8c..178cd8c 100644
--- a/lint/libs/lint_checks/src/test/.classpath
+++ b/lint/cli/src/test/.classpath
diff --git a/lint/libs/lint_checks/src/test/.project b/lint/cli/src/test/.project
index 5713c07..5713c07 100644
--- a/lint/libs/lint_checks/src/test/.project
+++ b/lint/cli/src/test/.project
diff --git a/lint/libs/lint_checks/src/test/.settings/org.eclipse.core.resources.prefs b/lint/cli/src/test/.settings/org.eclipse.core.resources.prefs
index 609db57..609db57 100644
--- a/lint/libs/lint_checks/src/test/.settings/org.eclipse.core.resources.prefs
+++ b/lint/cli/src/test/.settings/org.eclipse.core.resources.prefs
diff --git a/lint/cli/src/test/.settings/org.moreunit.prefs b/lint/cli/src/test/.settings/org.moreunit.prefs
new file mode 100644
index 0000000..4bc8717
--- /dev/null
+++ b/lint/cli/src/test/.settings/org.moreunit.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.moreunit.prefixes=
+org.moreunit.unitsourcefolder=lint_check-tests\:java\:lint-api\:src/main/java\#lint_check-tests\:java\:lint-checks\:src/main/java\#lint_check-tests\:java\:lint-cli\:src/main/java
+org.moreunit.useprojectsettings=true
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/LintCliXmlParserTest.java b/lint/cli/src/test/java/com/android/tools/lint/LintCliXmlParserTest.java
index a6f4aaf..a6f4aaf 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/LintCliXmlParserTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/LintCliXmlParserTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/MainTest.java b/lint/cli/src/test/java/com/android/tools/lint/MainTest.java
index ba31ed8..ba31ed8 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/MainTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/MainTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/XmlReporterTest.java b/lint/cli/src/test/java/com/android/tools/lint/XmlReporterTest.java
index 9ada70f..9ada70f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/XmlReporterTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/XmlReporterTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/AbstractCheckTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/AbstractCheckTest.java
index d54962a..d54962a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/AbstractCheckTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/AbstractCheckTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/AccessibilityDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/AccessibilityDetectorTest.java
index fe24446..fe24446 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/AccessibilityDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/AccessibilityDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/AlwaysShowActionDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/AlwaysShowActionDetectorTest.java
index f7879bb..f7879bb 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/AlwaysShowActionDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/AlwaysShowActionDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/AnnotationDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/AnnotationDetectorTest.java
index becca80..becca80 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/AnnotationDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/AnnotationDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ApiDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ApiDetectorTest.java
index e42280f..e42280f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ApiDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ApiDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ApiLookupTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ApiLookupTest.java
index 252ec5e..252ec5e 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ApiLookupTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ApiLookupTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ArraySizeDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ArraySizeDetectorTest.java
index 127e7f8..127e7f8 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ArraySizeDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ArraySizeDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ButtonDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ButtonDetectorTest.java
index 989f33c..989f33c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ButtonDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ButtonDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ChildCountDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ChildCountDetectorTest.java
index 517ca4d..517ca4d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ChildCountDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ChildCountDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ColorUsageDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ColorUsageDetectorTest.java
index d1a04e1..d1a04e1 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ColorUsageDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ColorUsageDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/CommentDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/CommentDetectorTest.java
index c352962..c352962 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/CommentDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/CommentDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/CutPasteDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/CutPasteDetectorTest.java
index df02a41..df02a41 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/CutPasteDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/CutPasteDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DeprecationDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/DeprecationDetectorTest.java
index f399014..f399014 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DeprecationDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/DeprecationDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DetectMissingPrefixTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/DetectMissingPrefixTest.java
index e8a6f23..e8a6f23 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DetectMissingPrefixTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/DetectMissingPrefixTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DosLineEndingDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/DosLineEndingDetectorTest.java
index 3682420..3682420 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DosLineEndingDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/DosLineEndingDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DuplicateIdDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/DuplicateIdDetectorTest.java
index 72a9035..72a9035 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DuplicateIdDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/DuplicateIdDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DuplicateResourceDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/DuplicateResourceDetectorTest.java
index a4a5a68..a4a5a68 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/DuplicateResourceDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/DuplicateResourceDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ExtraTextDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ExtraTextDetectorTest.java
index 9f6c2d3..9f6c2d3 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ExtraTextDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ExtraTextDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/FieldGetterDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/FieldGetterDetectorTest.java
index aa7607f..aa7607f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/FieldGetterDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/FieldGetterDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/FragmentDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/FragmentDetectorTest.java
index f732f71..f732f71 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/FragmentDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/FragmentDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/GridLayoutDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/GridLayoutDetectorTest.java
index dee52e1..dee52e1 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/GridLayoutDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/GridLayoutDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/HandlerDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/HandlerDetectorTest.java
index 1e9350c..1e9350c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/HandlerDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/HandlerDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/HardcodedDebugModeDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/HardcodedDebugModeDetectorTest.java
index edb6c50..edb6c50 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/HardcodedDebugModeDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/HardcodedDebugModeDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/HardcodedValuesDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/HardcodedValuesDetectorTest.java
index b326fd4..b326fd4 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/HardcodedValuesDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/HardcodedValuesDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/IconDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/IconDetectorTest.java
index e2c20ba..e2c20ba 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/IconDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/IconDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/InefficientWeightDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/InefficientWeightDetectorTest.java
index 644bb10..644bb10 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/InefficientWeightDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/InefficientWeightDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/InvalidPackageDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/InvalidPackageDetectorTest.java
index b634255..b634255 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/InvalidPackageDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/InvalidPackageDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/JavaPerformanceDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/JavaPerformanceDetectorTest.java
index 9705dff..9705dff 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/JavaPerformanceDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/JavaPerformanceDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/LabelForDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/LabelForDetectorTest.java
index 6d69e00..6d69e00 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/LabelForDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/LabelForDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/LocaleDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/LocaleDetectorTest.java
index 2ac3c4e..2ac3c4e 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/LocaleDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/LocaleDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ManifestOrderDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ManifestOrderDetectorTest.java
index ccb9123..ccb9123 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ManifestOrderDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ManifestOrderDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/MathDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/MathDetectorTest.java
index da12bda..da12bda 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/MathDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/MathDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/MergeRootFrameLayoutDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/MergeRootFrameLayoutDetectorTest.java
index 22a001f..22a001f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/MergeRootFrameLayoutDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/MergeRootFrameLayoutDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/MissingClassDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/MissingClassDetectorTest.java
index 4edf345..4edf345 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/MissingClassDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/MissingClassDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/MissingIdDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/MissingIdDetectorTest.java
index b72d8c8..b72d8c8 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/MissingIdDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/MissingIdDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/NamespaceDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/NamespaceDetectorTest.java
index 91aedb2..91aedb2 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/NamespaceDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/NamespaceDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/NestedScrollingWidgetDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/NestedScrollingWidgetDetectorTest.java
index 55da17e..55da17e 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/NestedScrollingWidgetDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/NestedScrollingWidgetDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/NonInternationalizedSmsDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/NonInternationalizedSmsDetectorTest.java
index 46e494e..46e494e 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/NonInternationalizedSmsDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/NonInternationalizedSmsDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ObsoleteLayoutParamsDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ObsoleteLayoutParamsDetectorTest.java
index 87211a2..87211a2 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ObsoleteLayoutParamsDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ObsoleteLayoutParamsDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/OnClickDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/OnClickDetectorTest.java
index e4d8bb5..e4d8bb5 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/OnClickDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/OnClickDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/OverdrawDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/OverdrawDetectorTest.java
index 7da4004..7da4004 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/OverdrawDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/OverdrawDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/OverrideDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/OverrideDetectorTest.java
index 68f80f9..68f80f9 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/OverrideDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/OverrideDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/PrivateKeyDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/PrivateKeyDetectorTest.java
index ff72dcb..ff72dcb 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/PrivateKeyDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/PrivateKeyDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/PrivateResourceDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/PrivateResourceDetectorTest.java
index ce1b717..ce1b717 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/PrivateResourceDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/PrivateResourceDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ProguardDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ProguardDetectorTest.java
index c493b8c..c493b8c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ProguardDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ProguardDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/PxUsageDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/PxUsageDetectorTest.java
index 68f218f..68f218f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/PxUsageDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/PxUsageDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/RegistrationDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/RegistrationDetectorTest.java
index 23a5ac3..23a5ac3 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/RegistrationDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/RegistrationDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/RequiredAttributeDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/RequiredAttributeDetectorTest.java
index 9b60532..9b60532 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/RequiredAttributeDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/RequiredAttributeDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ScrollViewChildDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ScrollViewChildDetectorTest.java
index ba79c50..ba79c50 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ScrollViewChildDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ScrollViewChildDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SdCardDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/SdCardDetectorTest.java
index 5ad46b9..5ad46b9 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SdCardDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/SdCardDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SecureRandomDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/SecureRandomDetectorTest.java
index 0ecbe02..0ecbe02 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SecureRandomDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/SecureRandomDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SecurityDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/SecurityDetectorTest.java
index 1c293c3..1c293c3 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SecurityDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/SecurityDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SetJavaScriptEnabledDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/SetJavaScriptEnabledDetectorTest.java
index 4979e6a..4979e6a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SetJavaScriptEnabledDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/SetJavaScriptEnabledDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SharedPrefsDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/SharedPrefsDetectorTest.java
index 7035c21..7035c21 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SharedPrefsDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/SharedPrefsDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/StateListDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/StateListDetectorTest.java
index 9ff67f4..9ff67f4 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/StateListDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/StateListDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/StringFormatDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/StringFormatDetectorTest.java
index a49955b..a49955b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/StringFormatDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/StringFormatDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/StyleCycleDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/StyleCycleDetectorTest.java
index d4823d7..d4823d7 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/StyleCycleDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/StyleCycleDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SystemPermissionsDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/SystemPermissionsDetectorTest.java
index 061882c..061882c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/SystemPermissionsDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/SystemPermissionsDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TextFieldDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/TextFieldDetectorTest.java
index 795bc85..795bc85 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TextFieldDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/TextFieldDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TextViewDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/TextViewDetectorTest.java
index 0ee144b..0ee144b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TextViewDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/TextViewDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TitleDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/TitleDetectorTest.java
index 7259cde..7259cde 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TitleDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/TitleDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ToastDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ToastDetectorTest.java
index 07941b7..07941b7 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ToastDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ToastDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TooManyViewsDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/TooManyViewsDetectorTest.java
index 51b977d..51b977d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TooManyViewsDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/TooManyViewsDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TranslationDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/TranslationDetectorTest.java
index 7a9830b..7a9830b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TranslationDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/TranslationDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TypoDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/TypoDetectorTest.java
index 3c49b3a..3c49b3a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TypoDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/TypoDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TypoLookupTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/TypoLookupTest.java
index e57b8ce..e57b8ce 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TypoLookupTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/TypoLookupTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TypographyDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/TypographyDetectorTest.java
index 16d0107..16d0107 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/TypographyDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/TypographyDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/UnusedResourceDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/UnusedResourceDetectorTest.java
index 9113e79..9113e79 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/UnusedResourceDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/UnusedResourceDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/UseCompoundDrawableDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/UseCompoundDrawableDetectorTest.java
index 146ff6f..146ff6f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/UseCompoundDrawableDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/UseCompoundDrawableDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/UselessViewDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/UselessViewDetectorTest.java
index c34b987..c34b987 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/UselessViewDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/UselessViewDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/Utf8DetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/Utf8DetectorTest.java
index d1a118d..d1a118d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/Utf8DetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/Utf8DetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ViewConstructorDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ViewConstructorDetectorTest.java
index 5517646..5517646 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ViewConstructorDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ViewConstructorDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ViewTagDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ViewTagDetectorTest.java
index 8d9e2d5..8d9e2d5 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ViewTagDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ViewTagDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ViewTypeDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ViewTypeDetectorTest.java
index cf38197..cf38197 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/ViewTypeDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ViewTypeDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/WakelockDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/WakelockDetectorTest.java
index f136dd9..f136dd9 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/WakelockDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/WakelockDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/WrongIdDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/WrongIdDetectorTest.java
index b3fd203..b3fd203 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/WrongIdDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/WrongIdDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/WrongImportDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/WrongImportDetectorTest.java
index c44f204..c44f204 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/WrongImportDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/WrongImportDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/WrongLocationDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/WrongLocationDetectorTest.java
index f30a604..f30a604 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/WrongLocationDetectorTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/WrongLocationDetectorTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/AbstractActivity.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/AbstractActivity.java.txt
index a9e0400..a9e0400 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/AbstractActivity.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/AbstractActivity.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/AndroidManifest.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/AndroidManifest.xml
index 75ef31c..75ef31c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/AndroidManifest.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/AndroidManifest.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/allowbackup.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/allowbackup.xml
index 2a95252..2a95252 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/allowbackup.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/allowbackup.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/allowbackup_ignore.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/allowbackup_ignore.xml
index 72f8bb4..72f8bb4 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/allowbackup_ignore.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/allowbackup_ignore.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest.class.data
index 4e2b100..4e2b100 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest.java.txt
index 456dd8b..456dd8b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest10.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest10.class.data
index 23ef1bd..23ef1bd 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest10.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest10.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest10.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest10.java.txt
index ae02a81..ae02a81 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest10.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest10.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11$MyActivity.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11$MyActivity.class.data
index 5368daf..5368daf 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11$MyActivity.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11$MyActivity.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11$MyLinear.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11$MyLinear.class.data
index 5ee9e96..5ee9e96 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11$MyLinear.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11$MyLinear.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11.class.data
index 17e10d6..17e10d6 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11.java.txt
index 8fb592c..8fb592c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest11.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest12.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest12.class.data
index 4056133..4056133 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest12.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest12.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest12.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest12.java.txt
index 6ac71db..6ac71db 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest12.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest12.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest2.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest2.class.data
index 32c3657..32c3657 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest2.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest2.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest2.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest2.java.txt
index aa6f344..aa6f344 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest2.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest2.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest3.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest3.class.data
index 3d39e74..3d39e74 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest3.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest3.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest3.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest3.java.txt
index d1ea3e4..d1ea3e4 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest3.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest3.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$1.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$1.class.data
index 8d3fbf7..8d3fbf7 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$1.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$1.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass1$InnerInnerClass1.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass1$InnerInnerClass1.class.data
index 940b83d..940b83d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass1$InnerInnerClass1.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass1$InnerInnerClass1.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass1.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass1.class.data
index 4da3d3b..4da3d3b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass1.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass1.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass2.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass2.class.data
index c8e914b..c8e914b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass2.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4$InnerClass2.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4.class.data
index b51d04a..b51d04a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4.java.txt
index de6be04..de6be04 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest4.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest5.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest5.class.data
index ad0cd48..ad0cd48 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest5.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest5.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest5.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest5.java.txt
index 4be8258..4be8258 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest5.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest5.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest6.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest6.class.data
index 7c0f3a7..7c0f3a7 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest6.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest6.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest6.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest6.java.txt
index ae6e5fa..ae6e5fa 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest6.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest6.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest7.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest7.class.data
index e9f739d..e9f739d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest7.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest7.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest7.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest7.java.txt
index 37ad6a7..37ad6a7 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest7.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest7.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest8.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest8.class.data
index b92e7d9..b92e7d9 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest8.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest8.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest8.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest8.java.txt
index f742ad1..f742ad1 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest8.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest8.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest9.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest9.class.data
index f50ebab..f50ebab 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest9.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest9.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest9.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest9.java.txt
index 199231e..199231e 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest9.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiCallTest9.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest$LocalClass.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest$LocalClass.class.data
index 136eed5..136eed5 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest$LocalClass.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest$LocalClass.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest.class.data
index 7dc3d60..7dc3d60 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest.java.txt
index 8626858..8626858 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1$1.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1$1.class.data
index f18f226..f18f226 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1$1.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1$1.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1$2.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1$2.class.data
index ac3863e..ac3863e 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1$2.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1$2.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1.class.data
index f51c54b..f51c54b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2$1.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2.class.data
index defae98..defae98 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2.java.txt
index 7574805..7574805 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/ApiTargetTest2.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/CloseTest.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/CloseTest.class.data
index acb19e5..acb19e5 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/CloseTest.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/CloseTest.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/CloseTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/CloseTest.java.txt
index dc3e538..dc3e538 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/CloseTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/CloseTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate$IntermediateCustomV.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate$IntermediateCustomV.class.data
index cbf323c..cbf323c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate$IntermediateCustomV.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate$IntermediateCustomV.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate.class.data
index 8d187da..8d187da 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate.java.txt
index fea5c4f..fea5c4f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/Intermediate.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest1.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest1.class.data
index 60d4e81..60d4e81 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest1.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest1.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest1.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest1.java.txt
index a8775d7..a8775d7 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest1.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest1.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest2.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest2.class.data
index fdb512b..fdb512b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest2.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest2.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest2.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest2.java.txt
index e325413..e325413 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest2.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest2.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest3.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest3.class.data
index 23e8b5c..23e8b5c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest3.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest3.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest3.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest3.java.txt
index c430ce4..c430ce4 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest3.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest3.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest4.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest4.class.data
index c85a4ff..c85a4ff 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest4.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest4.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest4.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest4.java.txt
index 2fa2af8..2fa2af8 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest4.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/SuppressTest4.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/TestEnum.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/TestEnum.class.data
index fa676b9..fa676b9 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/TestEnum.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/TestEnum.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/TestEnum.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/TestEnum.java.txt
index 2d68b28..2d68b28 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/TestEnum.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/TestEnum.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/TestLint.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/TestLint.class.data
index 9e74a7a..9e74a7a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/TestLint.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/TestLint.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/classpath b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/classpath
index a4763d1..a4763d1 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/classpath
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/classpath
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/colors.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/colors.xml
index fc84a61..fc84a61 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/colors.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/colors.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/holomanifest.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/holomanifest.xml
index 8890afc..8890afc 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/holomanifest.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/holomanifest.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/layout.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/layout.xml
index 83b6b0a..83b6b0a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/layout.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/layout.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/layout_targetapi.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/layout_targetapi.xml
index 51ce945..51ce945 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/layout_targetapi.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/layout_targetapi.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk1.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk1.xml
index 6a9c919..6a9c919 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk1.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk1.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk10.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk10.xml
index 2896fc8..2896fc8 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk10.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk10.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk14.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk14.xml
index 391a8aa..391a8aa 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk14.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk14.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk17.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk17.xml
index 1837db9..1837db9 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk17.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk17.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk2.xml
index 23a15be..23a15be 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk4.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk4.xml
index be95440..be95440 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk4.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/minsdk4.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/themes.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/themes.xml
index 478940e..478940e 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/themes.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/themes.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/unsupported.jar.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/unsupported.jar.data
index 7cbedc1..7cbedc1 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/unsupported.jar.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/unsupported.jar.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/view.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/view.xml
index 2f9fc84..2f9fc84 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/apicheck/view.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/apicheck/view.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/broken-manifest.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/broken-manifest.xml
index e55e908..e55e908 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/broken-manifest.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/broken-manifest.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/broken-manifest2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/broken-manifest2.xml
index 307046b..307046b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/broken-manifest2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/broken-manifest2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/.classpath b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/.classpath
index a4763d1..a4763d1 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/.classpath
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/.classpath
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AbstractActivity.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/AbstractActivity.class.data
index 85ebb78..85ebb78 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AbstractActivity.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/AbstractActivity.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AbstractActivity.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/AbstractActivity.java.txt
index a9e0400..a9e0400 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AbstractActivity.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/AbstractActivity.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifest.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifest.xml
index 2896fc8..2896fc8 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifest.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifest.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifestReg.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifestReg.xml
index 82fda69..82fda69 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifestReg.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifestReg.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifestWrongRegs.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifestWrongRegs.xml
index efe7213..efe7213 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifestWrongRegs.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/AndroidManifestWrongRegs.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/Class1$Class4.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/Class1$Class4.class.data
index bfd88db..bfd88db 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/Class1$Class4.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/Class1$Class4.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/Class1.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/Class1.class.data
index cee3058..cee3058 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/Class1.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/Class1.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/Class2$Class3.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/Class2$Class3.class.data
index 2a58332..2a58332 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/Class2$Class3.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/Class2$Class3.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/Class2.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/Class2.class.data
index 1b72f03..1b72f03 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/Class2.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/Class2.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CommentsActivity.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CommentsActivity.class.data
index 7f9f23b..7f9f23b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CommentsActivity.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CommentsActivity.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CommentsActivity.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CommentsActivity.java.txt
index 941a01d..941a01d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CommentsActivity.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CommentsActivity.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView1.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView1.class.data
index d6a8ad7..d6a8ad7 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView1.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView1.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView1.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView1.java.txt
index e871e74..e871e74 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView1.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView1.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView2.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView2.class.data
index 0788ef3..0788ef3 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView2.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView2.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView2.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView2.java.txt
index dccc8ec..dccc8ec 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView2.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView2.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView3.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView3.class.data
index a4b7c7d..a4b7c7d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView3.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView3.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView3.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView3.java.txt
index 86d983f..86d983f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView3.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomView3.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomViewTest.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomViewTest.class.data
index e145fbc..e145fbc 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomViewTest.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/CustomViewTest.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment1.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment1.class.data
index 11a98dd..11a98dd 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment1.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment1.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment2.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment2.class.data
index d77579a..d77579a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment2.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment2.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment3.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment3.class.data
index b1ec17d..b1ec17d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment3.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment3.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment4.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment4.class.data
index f89f8ed..f89f8ed 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment4.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment4.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment5.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment5.class.data
index 4a23e03..4a23e03 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment5.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment5.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment6.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment6.class.data
index 2e10e12..2e10e12 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment6.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$Fragment6.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$NotAFragment.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$NotAFragment.class.data
index 8f5b827..8f5b827 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$NotAFragment.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$NotAFragment.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$ValidFragment1.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$ValidFragment1.class.data
index a3354a7..a3354a7 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$ValidFragment1.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest$ValidFragment1.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest.class.data
index 6cc8387..6cc8387 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest.java.txt
index d27c04a..d27c04a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/FragmentTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.class.data
index 73a9947..73a9947 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.jar.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.jar.data
index f5ef6d1..f5ef6d1 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.jar.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.jar.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.java.txt
index 25f3421..25f3421 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/GetterTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$1.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$1.class.data
index ae65532..ae65532 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$1.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$1.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$Inner.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$Inner.class.data
index 3975896..3975896 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$Inner.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$Inner.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$StaticInner.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$StaticInner.class.data
index 690ee89..690ee89 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$StaticInner.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest$StaticInner.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest.class.data
index 93f9999..93f9999 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest.java.txt
index 7622c98..7622c98 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/HandlerTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/LocaleTest.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/LocaleTest.class.data
index 2b10aa9..2b10aa9 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/LocaleTest.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/LocaleTest.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/LocaleTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/LocaleTest.java.txt
index 3c60c9d..3c60c9d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/LocaleTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/LocaleTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/MathTest.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/MathTest.class.data
index 6647f1c..6647f1c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/MathTest.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/MathTest.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/MathTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/MathTest.java.txt
index 0193f81..0193f81 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/MathTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/MathTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/OnClickActivity.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/OnClickActivity.class.data
index 216a865..216a865 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/OnClickActivity.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/OnClickActivity.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/OnClickActivity.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/OnClickActivity.java.txt
index 557ba0a..557ba0a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/OnClickActivity.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/OnClickActivity.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/SecureRandomTest.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/SecureRandomTest.class.data
index 3236187..3236187 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/SecureRandomTest.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/SecureRandomTest.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/SecureRandomTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/SecureRandomTest.java.txt
index c05fbd9..c05fbd9 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/SecureRandomTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/SecureRandomTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestFieldGetter.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestFieldGetter.class.data
index d922751..d922751 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestFieldGetter.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestFieldGetter.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestFieldGetter.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestFieldGetter.java.txt
index 00da161..00da161 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestFieldGetter.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestFieldGetter.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider.class.data
index 945742f..945742f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider.java.txt
index 2bf1bb8..2bf1bb8 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider2.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider2.class.data
index 0973dbe..0973dbe 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider2.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider2.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider2.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider2.java.txt
index 881975d..881975d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider2.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestProvider2.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver$1.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver$1.class.data
index 7ede85a..7ede85a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver$1.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver$1.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver.class.data
index 6180e40..6180e40 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver.java.txt
index 90893c8..90893c8 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestReceiver.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestService.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestService.class.data
index a98f7aa..a98f7aa 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestService.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestService.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestService.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestService.java.txt
index d3f128a..d3f128a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/TestService.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/TestService.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/ViewTagTest.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/ViewTagTest.class.data
index f26032c..f26032c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/ViewTagTest.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/ViewTagTest.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/ViewTagTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/ViewTagTest.java.txt
index 8e72fd0..8e72fd0 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/ViewTagTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/ViewTagTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity1.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity1.class.data
index d4733e6..d4733e6 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity1.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity1.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity1.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity1.java.txt
index 0b14691..0b14691 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity1.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity1.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity2.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity2.class.data
index 89e35c1..89e35c1 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity2.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity2.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity2.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity2.java.txt
index fa91a43..fa91a43 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity2.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity2.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity3.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity3.class.data
index b430519..b430519 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity3.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity3.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity3.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity3.java.txt
index 8a842eb..8a842eb 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity3.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity3.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity4.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity4.class.data
index 8905203..8905203 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity4.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity4.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity4.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity4.java.txt
index 9d6331f..9d6331f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity4.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity4.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity5.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity5.class.data
index 9eca365..9eca365 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity5.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity5.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity5.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity5.java.txt
index 060f2b1..060f2b1 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity5.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity5.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity6.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity6.class.data
index 51fdf69..51fdf69 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity6.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity6.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity6.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity6.java.txt
index a122fa3..a122fa3 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity6.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity6.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity7.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity7.class.data
index 289b0d3..289b0d3 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity7.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity7.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity7.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity7.java.txt
index be48dac..be48dac 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity7.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity7.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity8.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity8.class.data
index 5bd3ae2..5bd3ae2 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity8.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity8.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity8.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity8.java.txt
index a6307c5..a6307c5 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity8.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/WakelockActivity8.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/classes.jar b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/classes.jar
index fa52dcf..fa52dcf 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/classes.jar
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/classes.jar
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/classpath-jar b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/classpath-jar
index 53f7d6c..53f7d6c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/classpath-jar
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/classpath-jar
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/classpath-lib b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/classpath-lib
index e730df8..e730df8 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/bytecode/classpath-lib
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/bytecode/classpath-lib
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/debuggable.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/debuggable.xml
index 1c234e4..1c234e4 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/debuggable.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/debuggable.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate-manifest-ignore.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/duplicate-manifest-ignore.xml
index 76cfd4d..76cfd4d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate-manifest-ignore.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/duplicate-manifest-ignore.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate-manifest.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/duplicate-manifest.xml
index e1fc3c6..e1fc3c6 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate-manifest.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/duplicate-manifest.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions1.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions1.xml
index 511fa46..511fa46 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions1.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions1.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions2.xml
index 3729f79..3729f79 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions3.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions3.xml
index a1a0638..a1a0638 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions3.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/duplicate_permissions3.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity0.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportactivity0.xml
index cc436d0..cc436d0 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity0.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportactivity0.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity1.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportactivity1.xml
index 0fc80f3..0fc80f3 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity1.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportactivity1.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportactivity2.xml
index 2b4cf6a..2b4cf6a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportactivity2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity3.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportactivity3.xml
index 191c699..191c699 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity3.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportactivity3.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity4.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportactivity4.xml
index 31345cc..31345cc 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportactivity4.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportactivity4.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportprovider1.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportprovider1.xml
index 02ec2e0..02ec2e0 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportprovider1.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportprovider1.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportprovider2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportprovider2.xml
index 4e3fc1b..4e3fc1b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportprovider2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportprovider2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver0.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportreceiver0.xml
index f9c5190..f9c5190 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver0.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportreceiver0.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver1.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportreceiver1.xml
index 0652d49..0652d49 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver1.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportreceiver1.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportreceiver2.xml
index 46d5dcb..46d5dcb 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportreceiver2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver3.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportreceiver3.xml
index bc3ec8a..bc3ec8a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver3.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportreceiver3.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver4.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportreceiver4.xml
index 5d9a826..5d9a826 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver4.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportreceiver4.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver5.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportreceiver5.xml
index afa74cf..afa74cf 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver5.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportreceiver5.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver6.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportreceiver6.xml
index b1ce3e3..b1ce3e3 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportreceiver6.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportreceiver6.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice1.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportservice1.xml
index 67e519f..67e519f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice1.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportservice1.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportservice2.xml
index 491a14f..491a14f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportservice2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice3.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportservice3.xml
index 8d5f166..8d5f166 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice3.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportservice3.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice4.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportservice4.xml
index f952225..f952225 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice4.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportservice4.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice5.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportservice5.xml
index c9b9a78..c9b9a78 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/exportservice5.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/exportservice5.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/gen/my/pkg/R.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/gen/my/pkg/R.java.txt
index fad43bf..fad43bf 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/gen/my/pkg/R.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/gen/my/pkg/R.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/gen/my/pkg/R2.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/gen/my/pkg/R2.java.txt
index ed8fd7d..ed8fd7d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/gen/my/pkg/R2.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/gen/my/pkg/R2.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/grantpermission.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/grantpermission.xml
index e07c370..e07c370 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/grantpermission.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/grantpermission.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/ignoremissing.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/ignoremissing.xml
index 99d804e..99d804e 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/ignoremissing.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/ignoremissing.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/minsdk5targetsdk14.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/minsdk5targetsdk14.xml
index 482b7fa..482b7fa 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/minsdk5targetsdk14.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/minsdk5targetsdk14.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/minsdk5targetsdk9.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/minsdk5targetsdk9.xml
index 1cc7596..1cc7596 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/minsdk5targetsdk9.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/minsdk5targetsdk9.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/missingmin.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/missingmin.xml
index 19b3d0a..19b3d0a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/missingmin.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/missingmin.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/missingprefix.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/missingprefix.xml
index 2bb6824..2bb6824 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/missingprefix.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/missingprefix.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/missingtarget.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/missingtarget.xml
index 1f4fba0..1f4fba0 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/missingtarget.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/missingtarget.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/missingusessdk.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/missingusessdk.xml
index 00c0167..00c0167 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/missingusessdk.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/missingusessdk.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiplesdk.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiplesdk.xml
index 950cf4d..950cf4d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiplesdk.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiplesdk.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/LibraryCode.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiproject/LibraryCode.java.txt
index 25a9d75..25a9d75 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/LibraryCode.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiproject/LibraryCode.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/MainCode.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiproject/MainCode.java.txt
index 7955e6b..7955e6b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/MainCode.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiproject/MainCode.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/library-manifest.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiproject/library-manifest.xml
index ed6e65b..ed6e65b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/library-manifest.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiproject/library-manifest.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/library.properties b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiproject/library.properties
index d525577..d525577 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/library.properties
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiproject/library.properties
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/main-manifest.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiproject/main-manifest.xml
index 5c50721..5c50721 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/main-manifest.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiproject/main-manifest.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/main-merge.properties b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiproject/main-merge.properties
index f1b8f95..f1b8f95 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/main-merge.properties
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiproject/main-merge.properties
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/main.properties b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiproject/main.properties
index f366140..f366140 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/main.properties
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiproject/main.properties
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/strings.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiproject/strings.xml
index f53e15f..f53e15f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/multiproject/strings.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/multiproject/strings.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/oldtarget.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/oldtarget.xml
index d72d7fc..d72d7fc 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/oldtarget.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/oldtarget.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/.classpath b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/.classpath
index a4763d1..a4763d1 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/.classpath
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/.classpath
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/.project b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/.project
index 5479f13..5479f13 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/.project
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/.project
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/AndroidManifest.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/AndroidManifest.xml
index c9c6127..c9c6127 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/AndroidManifest.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/AndroidManifest.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/gen/test/pkg/BuildConfig.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/gen/test/pkg/BuildConfig.java.txt
index 57e2a0e..57e2a0e 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/gen/test/pkg/BuildConfig.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/gen/test/pkg/BuildConfig.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/gen/test/pkg/R.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/gen/test/pkg/R.java.txt
index c7900de..c7900de 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/gen/test/pkg/R.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/gen/test/pkg/R.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/project.properties b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/project.properties
index f049142..f049142 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/project.properties
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/project.properties
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-hdpi/ic_launcher.png b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-hdpi/ic_launcher.png
index 8074c4c..8074c4c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-hdpi/ic_launcher.png
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-hdpi/ic_launcher.png
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-ldpi/ic_launcher.png b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-ldpi/ic_launcher.png
index 1095584..1095584 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-ldpi/ic_launcher.png
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-ldpi/ic_launcher.png
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-mdpi/ic_launcher.png b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-mdpi/ic_launcher.png
index a07c69f..a07c69f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-mdpi/ic_launcher.png
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable-mdpi/ic_launcher.png
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable/custombg.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable/custombg.xml
index a8e70d4..a8e70d4 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable/custombg.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable/custombg.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable/custombg2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable/custombg2.xml
index 47513c3..47513c3 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable/custombg2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/drawable/custombg2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/fifth.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/fifth.xml
index 00a5c25..00a5c25 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/fifth.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/fifth.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/fourth.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/fourth.xml
index 3102f2c..3102f2c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/fourth.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/fourth.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/main.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/main.xml
index 3102f2c..3102f2c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/main.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/main.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/main_ignore.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/main_ignore.xml
index 63f0fd3..63f0fd3 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/main_ignore.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/main_ignore.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/second.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/second.xml
index 3102f2c..3102f2c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/second.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/second.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/sixth.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/sixth.xml
index 7f17c9e..7f17c9e 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/sixth.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/sixth.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/third.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/third.xml
index 3102f2c..3102f2c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/third.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/layout/third.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/values/strings.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/values/strings.xml
index bb302bc..bb302bc 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/values/strings.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/values/strings.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/values/styles.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/values/styles.xml
index 5ab6ad6..5ab6ad6 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/res/values/styles.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/res/values/styles.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/FourthActivity.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/FourthActivity.java.txt
index 04fac3f..04fac3f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/FourthActivity.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/FourthActivity.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/OverdrawActivity.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/OverdrawActivity.java.txt
index 8779c19..8779c19 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/OverdrawActivity.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/OverdrawActivity.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/SecondActivity.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/SecondActivity.java.txt
index 52b7ca0..52b7ca0 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/SecondActivity.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/SecondActivity.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/ThirdActivity.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/ThirdActivity.java.txt
index 3d4da95..3d4da95 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/ThirdActivity.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/overdraw/src/test/pkg/ThirdActivity.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/proguard.cfg b/lint/cli/src/test/java/com/android/tools/lint/checks/data/proguard.cfg
index 12dd039..12dd039 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/proguard.cfg
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/proguard.cfg
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/proguard.pro b/lint/cli/src/test/java/com/android/tools/lint/checks/data/proguard.pro
index 53f41fe..53f41fe 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/proguard.pro
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/proguard.pro
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/proguard.properties b/lint/cli/src/test/java/com/android/tools/lint/checks/data/proguard.properties
index 989c3c7..989c3c7 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/proguard.properties
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/proguard.properties
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/project.properties1 b/lint/cli/src/test/java/com/android/tools/lint/checks/data/project.properties1
index 2b783dd..2b783dd 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/project.properties1
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/project.properties1
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/project.properties2 b/lint/cli/src/test/java/com/android/tools/lint/checks/data/project.properties2
index d9a28ec..d9a28ec 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/project.properties2
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/project.properties2
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/project.properties3 b/lint/cli/src/test/java/com/android/tools/lint/checks/data/project.properties3
index 3cb9d31..3cb9d31 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/project.properties3
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/project.properties3
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/project.properties4 b/lint/cli/src/test/java/com/android/tools/lint/checks/data/project.properties4
index fca9311..fca9311 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/project.properties4
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/project.properties4
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/protectedpermissions.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/protectedpermissions.xml
index 8b62497..8b62497 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/protectedpermissions.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/protectedpermissions.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/protectedpermissions2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/protectedpermissions2.xml
index d3b88da..d3b88da 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/protectedpermissions2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/protectedpermissions2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifest.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifest.xml
index 0b07cdf..0b07cdf 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifest.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifest.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestInner.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestInner.xml
index 1b87d9d..1b87d9d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestInner.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestInner.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestWrong.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestWrong.xml
index bfdcde0..bfdcde0 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestWrong.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestWrong.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestWrong2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestWrong2.xml
index 8773e0f..8773e0f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestWrong2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/AndroidManifestWrong2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Bar.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/Bar.class.data
index e51a0e8..e51a0e8 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Bar.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/Bar.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Bar.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/Bar.java.txt
index b514f11..b514f11 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Bar.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/Bar.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Foo$Bar.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/Foo$Bar.class.data
index da45ebb..da45ebb 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Foo$Bar.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/Foo$Bar.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Foo$Baz.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/Foo$Baz.class.data
index aadd767..aadd767 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Foo$Baz.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/Foo$Baz.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Foo.class.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/Foo.class.data
index aafcc73..aafcc73 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Foo.class.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/Foo.class.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Foo.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/Foo.java.txt
index a647030..a647030 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/registration/Foo.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/registration/Foo.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/appwidget_bg.9.png b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/appwidget_bg.9.png
index d9af8fb..d9af8fb 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/appwidget_bg.9.png
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/appwidget_bg.9.png
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/appwidget_bg_focus.9.png b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/appwidget_bg_focus.9.png
index ee098af..ee098af 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/appwidget_bg_focus.9.png
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/appwidget_bg_focus.9.png
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/filled.png b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/filled.png
index 59fd90a..59fd90a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/filled.png
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/filled.png
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/ic_launcher.png b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/ic_launcher.png
index 8074c4c..8074c4c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/ic_launcher.png
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/ic_launcher.png
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/other.9.png b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/other.9.png
index d9af8fb..d9af8fb 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/other.9.png
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/other.9.png
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/unrelated.png b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/unrelated.png
index 8074c4c..8074c4c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/unrelated.png
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-hdpi/unrelated.png
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/frame.png b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/frame.png
index 840b2c2..840b2c2 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/frame.png
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/frame.png
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/ic_menu_add_clip_normal.png b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/ic_menu_add_clip_normal.png
index 26f5afe..26f5afe 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/ic_menu_add_clip_normal.png
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/ic_menu_add_clip_normal.png
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/sample_icon.gif b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/sample_icon.gif
index 1a0be94..1a0be94 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/sample_icon.gif
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/sample_icon.gif
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/sample_icon.jpg b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/sample_icon.jpg
index f872487..f872487 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/sample_icon.jpg
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/sample_icon.jpg
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/stat_notify_alarm.png b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/stat_notify_alarm.png
index c61626c..c61626c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/stat_notify_alarm.png
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-mdpi/stat_notify_alarm.png
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-nodpi/frame.png b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-nodpi/frame.png
index 840b2c2..840b2c2 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-nodpi/frame.png
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-nodpi/frame.png
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-xlarge-nodpi-v11/frame.png b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-xlarge-nodpi-v11/frame.png
index 840b2c2..840b2c2 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable-xlarge-nodpi-v11/frame.png
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable-xlarge-nodpi-v11/frame.png
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/ic_launcher.png b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable/ic_launcher.png
index a07c69f..a07c69f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/ic_launcher.png
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable/ic_launcher.png
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/ic_menu_help.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable/ic_menu_help.xml
index 41f840f..41f840f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/ic_menu_help.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable/ic_menu_help.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/states.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable/states.xml
index 3dedb64..3dedb64 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/states.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable/states.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/states2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable/states2.xml
index dac176d..dac176d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/states2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable/states2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/states3.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable/states3.xml
index c3fc533..c3fc533 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/drawable/states3.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/drawable/states3.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/accessibility.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/accessibility.xml
index c00a880..c00a880 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/accessibility.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/accessibility.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/accessibility2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/accessibility2.xml
index 3f45c26..3f45c26 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/accessibility2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/accessibility2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/activity_item_two_pane.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/activity_item_two_pane.xml
index b19047a..b19047a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/activity_item_two_pane.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/activity_item_two_pane.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights.xml
index fa5a39a..fa5a39a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights2.xml
index 2e4af6b..2e4af6b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights3.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights3.xml
index 079bd24..079bd24 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights3.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/baseline_weights3.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/breadcrumbs_in_fragment.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/breadcrumbs_in_fragment.xml
index 5e8824a..5e8824a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/breadcrumbs_in_fragment.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/breadcrumbs_in_fragment.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/broken.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/broken.xml
index 5dd9d2d..5dd9d2d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/broken.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/broken.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar.xml
index d02d49b..d02d49b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar2.xml
index f6ae19b..f6ae19b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar3.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar3.xml
index 8dbcb10..8dbcb10 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar3.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar3.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar4.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar4.xml
index 9fe69d5..9fe69d5 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar4.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar4.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar_suppressed.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar_suppressed.xml
index a03824d..a03824d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar_suppressed.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/buttonbar_suppressed.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/casts.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/casts.xml
index 40f01ed..40f01ed 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/casts.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/casts.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/casts2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/casts2.xml
index 249c02f..249c02f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/casts2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/casts2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/casts3.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/casts3.xml
index 990e5f0..990e5f0 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/casts3.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/casts3.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/casts4.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/casts4.xml
index 371964e..371964e 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/casts4.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/casts4.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/compound.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/compound.xml
index f7b28ef..f7b28ef 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/compound.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/compound.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/compound2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/compound2.xml
index 24f45dc..24f45dc 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/compound2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/compound2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/compound3.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/compound3.xml
index 68d42fa..68d42fa 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/compound3.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/compound3.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/crcrlf.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/crcrlf.xml
index d029725..d029725 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/crcrlf.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/crcrlf.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/crcrlf_ignore.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/crcrlf_ignore.xml
index 680a765..680a765 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/crcrlf_ignore.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/crcrlf_ignore.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/customattrlayout.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/customattrlayout.xml
index b4c49f0..b4c49f0 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/customattrlayout.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/customattrlayout.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/customview.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/customview.xml
index 976d636..976d636 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/customview.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/customview.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/customview2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/customview2.xml
index fcd43e6..fcd43e6 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/customview2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/customview2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/default_item_badges.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/default_item_badges.xml
index 082a520..082a520 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/default_item_badges.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/default_item_badges.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/deprecation.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/deprecation.xml
index 70b7f23..70b7f23 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/deprecation.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/deprecation.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/detailed_item.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/detailed_item.xml
index a5d4226..a5d4226 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/detailed_item.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/detailed_item.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/duplicate.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/duplicate.xml
index e142e9e..e142e9e 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/duplicate.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/duplicate.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/edit_textview.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/edit_textview.xml
index c0d8cda..c0d8cda 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/edit_textview.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/edit_textview.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/edit_type.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/edit_type.xml
index 8f8cf90..8f8cf90 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/edit_type.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/edit_type.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/encoding.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/encoding.xml
index 390aec4..390aec4 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/encoding.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/encoding.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/encoding2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/encoding2.xml
index fe6e092..fe6e092 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/encoding2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/encoding2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/fragment.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/fragment.xml
index bec72b2..bec72b2 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/fragment.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/fragment.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/gridlayout.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/gridlayout.xml
index 026f673..026f673 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/gridlayout.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/gridlayout.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/has_children.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/has_children.xml
index cac27d4..cac27d4 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/has_children.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/has_children.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/has_children2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/has_children2.xml
index bd8c301..bd8c301 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/has_children2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/has_children2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/ignores.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/ignores.xml
index d4be910..d4be910 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/ignores.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/ignores.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/inefficient_weight.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/inefficient_weight.xml
index 058fde1..058fde1 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/inefficient_weight.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/inefficient_weight.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/inefficient_weight2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/inefficient_weight2.xml
index 0e7f396..0e7f396 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/inefficient_weight2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/inefficient_weight2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/labelfor.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/labelfor.xml
index 7d4935c..7d4935c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/labelfor.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/labelfor.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/labelfor_ignore.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/labelfor_ignore.xml
index 41d2821..41d2821 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/labelfor_ignore.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/labelfor_ignore.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout1.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/layout1.xml
index efd6be0..efd6be0 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout1.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/layout1.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout1_ignore.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/layout1_ignore.xml
index 13bd075..13bd075 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout1_ignore.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/layout1_ignore.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/layout2.xml
index 9fc9c5f..9fc9c5f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/layout2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout3.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/layout3.xml
index aa5a137..aa5a137 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout3.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/layout3.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout4.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/layout4.xml
index 442efd4..442efd4 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/layout4.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/layout4.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/listseparator.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/listseparator.xml
index ac50ff7..ac50ff7 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/listseparator.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/listseparator.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace.xml
index a984333..a984333 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace2.xml
index 59001c2..59001c2 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace3.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace3.xml
index fcc5aa4..fcc5aa4 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace3.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace3.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace4.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace4.xml
index e7ecb06..e7ecb06 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace4.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/namespace4.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/nested_weights.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/nested_weights.xml
index a375e06..a375e06 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/nested_weights.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/nested_weights.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/nested_weights2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/nested_weights2.xml
index 7002b89..7002b89 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/nested_weights2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/nested_weights2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/note_edit.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/note_edit.xml
index 0b84439..0b84439 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/note_edit.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/note_edit.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/now_playing_after.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/now_playing_after.xml
index 64f681c..64f681c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/now_playing_after.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/now_playing_after.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/onclick.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/onclick.xml
index 882c035..882c035 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/onclick.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/onclick.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/private.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/private.xml
index c98797d..c98797d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/private.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/private.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/scrolling.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/scrolling.xml
index 0bed702..0bed702 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/scrolling.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/scrolling.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/simple.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/simple.xml
index d462c69..d462c69 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/simple.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/simple.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/simple_ignore.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/simple_ignore.xml
index 1b3de90..1b3de90 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/simple_ignore.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/simple_ignore.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/simpleinclude.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/simpleinclude.xml
index 4cb994b..4cb994b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/simpleinclude.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/simpleinclude.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/size.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/size.xml
index e4d4a9b..e4d4a9b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/size.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/size.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/size2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/size2.xml
index d06d00f..d06d00f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/size2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/size2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/sizeincluded.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/sizeincluded.xml
index 5fccff6..5fccff6 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/sizeincluded.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/sizeincluded.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/textsize.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/textsize.xml
index 610867e..610867e 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/textsize.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/textsize.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/too_deep.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/too_deep.xml
index 7e92008..7e92008 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/too_deep.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/too_deep.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/too_many.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/too_many.xml
index e2dbd6b..e2dbd6b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/too_many.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/too_many.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/unused_namespace.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/unused_namespace.xml
index f633e4b..f633e4b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/unused_namespace.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/unused_namespace.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/useless.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/useless.xml
index c317235..c317235 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/useless.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/useless.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/useless2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/useless2.xml
index a819036..a819036 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/useless2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/useless2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/useless3.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/useless3.xml
index 1d9e9b7..1d9e9b7 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/useless3.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/useless3.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong0dp.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong0dp.xml
index 136329f..136329f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong0dp.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong0dp.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_dimension.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_dimension.xml
index 79b922b..79b922b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_dimension.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_dimension.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace.xml
index c6e2143..c6e2143 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace2.xml
index 49dc611..49dc611 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace3.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace3.xml
index 02252b4..02252b4 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace3.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace3.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace4.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace4.xml
index 4142622..4142622 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace4.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace4.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace5.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace5.xml
index ce0fc4b..ce0fc4b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace5.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrong_namespace5.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams.xml
index 9c8bd5c..9c8bd5c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams2.xml
index 309dffd..309dffd 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams3.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams3.xml
index 79173c7..79173c7 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams3.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams3.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams4.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams4.xml
index 802e215..802e215 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams4.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams4.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams5.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams5.xml
index 947bf48..947bf48 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams5.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams5.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams6.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams6.xml
index 8691d7c..8691d7c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams6.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams6.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams_ignore.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams_ignore.xml
index d0e6ff0..d0e6ff0 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams_ignore.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/layout/wrongparams_ignore.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions.xml
index 89fa751..89fa751 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions2.xml
index 35b85d4..35b85d4 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions2_ignore.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions2_ignore.xml
index 47cd32e..47cd32e 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions2_ignore.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/menu-land/actions2_ignore.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu/menu.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/menu/menu.xml
index 4f0839b..4f0839b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu/menu.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/menu/menu.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu/titles.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/menu/titles.xml
index a1ae5bb..a1ae5bb 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/menu/titles.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/menu/titles.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/private_key.pem b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/private_key.pem
index 03b9477..03b9477 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/private_key.pem
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/private_key.pem
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-cs/arrays.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-cs/arrays.xml
index dd8e580..dd8e580 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-cs/arrays.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-cs/arrays.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-cs/strings.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-cs/strings.xml
index 2830534..2830534 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-cs/strings.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-cs/strings.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-cs/translatedarrays.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-cs/translatedarrays.xml
index f20dd3a..f20dd3a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-cs/translatedarrays.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-cs/translatedarrays.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-de-rDE/strings.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-de-rDE/strings.xml
index 82510ae..82510ae 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-de-rDE/strings.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-de-rDE/strings.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-de/strings.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-de/strings.xml
index 055dd52..055dd52 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-de/strings.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-de/strings.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-de/typos.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-de/typos.xml
index 5108cc9..5108cc9 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-de/typos.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-de/typos.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es-rUS/strings.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-es-rUS/strings.xml
index 4de53dd..4de53dd 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es-rUS/strings.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-es-rUS/strings.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/donottranslate.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-es/donottranslate.xml
index f28594c..f28594c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/donottranslate.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-es/donottranslate.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/formatstrings.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-es/formatstrings.xml
index 4ef3d94..4ef3d94 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/formatstrings.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-es/formatstrings.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/formatstrings_ignore.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-es/formatstrings_ignore.xml
index 0cf7008..0cf7008 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/formatstrings_ignore.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-es/formatstrings_ignore.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings.xml
index ae5822a..ae5822a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings_ignore.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings_ignore.xml
index 4358448..4358448 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings_ignore.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings_ignore.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings_locale.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings_locale.xml
index b485dee..b485dee 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings_locale.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-es/strings_locale.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-fr/strings.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-fr/strings.xml
index 85a28c9..85a28c9 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-fr/strings.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-fr/strings.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-it/stringarrays.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-it/stringarrays.xml
index 7bd83e9..7bd83e9 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-it/stringarrays.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-it/stringarrays.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-land/arrays.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-land/arrays.xml
index 4495dfd..4495dfd 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-land/arrays.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-land/arrays.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-land/arrays_ignore.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-land/arrays_ignore.xml
index 24e76cd..24e76cd 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-land/arrays_ignore.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-land/arrays_ignore.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-land/strings.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-land/strings.xml
index 824df2a..824df2a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-land/strings.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-land/strings.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-nb/typos.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-nb/typos.xml
index 06cec0d..06cec0d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-nb/typos.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-nb/typos.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-nb/typos_locale.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-nb/typos_locale.xml
index ed1edd1..ed1edd1 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-nb/typos_locale.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-nb/typos_locale.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-nl-rNL/arrays.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-nl-rNL/arrays.xml
index 36faf96..36faf96 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-nl-rNL/arrays.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-nl-rNL/arrays.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-nl-rNL/strings.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-nl-rNL/strings.xml
index 1bd9ea2..1bd9ea2 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values-nl-rNL/strings.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values-nl-rNL/strings.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/arrays.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/arrays.xml
index de544b3..de544b3 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/arrays.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/arrays.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/arrayusage.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/arrayusage.xml
index 0b890f7..0b890f7 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/arrayusage.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/arrayusage.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/buttonbar-values.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/buttonbar-values.xml
index 4a32e7d..4a32e7d 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/buttonbar-values.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/buttonbar-values.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/customattr.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/customattr.xml
index e1ca2d4..e1ca2d4 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/customattr.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/customattr.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings-version1.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings-version1.xml
index 4d3e5a7..4d3e5a7 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings-version1.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings-version1.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings-version2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings-version2.xml
index d1757f7..d1757f7 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings-version2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings-version2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings.xml
index 6b1985c..6b1985c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings2.xml
index 23291d2..23291d2 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings3.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings3.xml
index 2424078..2424078 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings3.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings3.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings4.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings4.xml
index c4e245e..c4e245e 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings4.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings4.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings_ignore.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings_ignore.xml
index 9834119..9834119 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings_ignore.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/formatstrings_ignore.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/nontranslatable.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/nontranslatable.xml
index f608bff..f608bff 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/nontranslatable.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/nontranslatable.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/nontranslatable2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/nontranslatable2.xml
index 4fcfdc6..4fcfdc6 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/nontranslatable2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/nontranslatable2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/plurals.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/plurals.xml
index 703a841..703a841 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/plurals.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/plurals.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/pxsp.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/pxsp.xml
index 7a44201..7a44201 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/pxsp.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/pxsp.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/sizestyles.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/sizestyles.xml
index 468974e..468974e 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/sizestyles.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/sizestyles.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/stringarrays.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/stringarrays.xml
index 6405580..6405580 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/stringarrays.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/stringarrays.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/strings.xml
index 5aec951..5aec951 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/strings.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/strings2.xml
index bce9e32..bce9e32 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/strings2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings3.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/strings3.xml
index 6da33ae..6da33ae 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings3.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/strings3.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings4.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/strings4.xml
index 76d88a4..76d88a4 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings4.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/strings4.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings_ignore.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/strings_ignore.xml
index a69d4c8..a69d4c8 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/strings_ignore.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/strings_ignore.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/stylecycle.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/stylecycle.xml
index 448eb9c..448eb9c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/stylecycle.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/stylecycle.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/styles.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/styles.xml
index 34e2d6f..34e2d6f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/styles.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/styles.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/themes.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/themes.xml
index eba1c3c..eba1c3c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/themes.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/themes.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/themes2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/themes2.xml
index b587923..b587923 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/themes2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/themes2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/translatedarrays.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/translatedarrays.xml
index 4707734..4707734 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/translatedarrays.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/translatedarrays.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/typography.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/typography.xml
index 1dd4845..1dd4845 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/typography.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/typography.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/typos.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/typos.xml
index dd24812..dd24812 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/res/values/typos.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/res/values/typos.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/my/pkg/Test.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/my/pkg/Test.java.txt
index 3905b8c..3905b8c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/my/pkg/Test.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/my/pkg/Test.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/pkg1/Class1.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/pkg1/Class1.java.txt
index 193ff3c..193ff3c 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/pkg1/Class1.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/pkg1/Class1.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/pkg2/Class2.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/pkg2/Class2.java.txt
index 651c021..651c021 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/pkg2/Class2.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/pkg2/Class2.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionBarTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionBarTest.java.txt
index 217f3b6..217f3b6 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionBarTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionBarTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest1.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest1.java.txt
index deeffde..deeffde 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest1.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest1.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest1_ignore.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest1_ignore.java.txt
index 5fea6be..5fea6be 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest1_ignore.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest1_ignore.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest2.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest2.java.txt
index 2d5df6f..2d5df6f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest2.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ActionTest2.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/BadImport.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/BadImport.java.txt
index f5b4dd0..f5b4dd0 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/BadImport.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/BadImport.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/CustomViewTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/CustomViewTest.java.txt
index 1862ccc..1862ccc 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/CustomViewTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/CustomViewTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Foo.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Foo.java.txt
index 6e16a72..6e16a72 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Foo.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Foo.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Hidden.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Hidden.java.txt
index 847cd88..847cd88 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Hidden.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Hidden.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ImportFrameActivity.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ImportFrameActivity.java.txt
index 510dadc..510dadc 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ImportFrameActivity.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ImportFrameActivity.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/InflaterTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/InflaterTest.java.txt
index 5a4e346..5a4e346 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/InflaterTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/InflaterTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/JavaPerformanceTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/JavaPerformanceTest.java.txt
index a8caccb..a8caccb 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/JavaPerformanceTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/JavaPerformanceTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/NonInternationalizedSmsDetectorTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/NonInternationalizedSmsDetectorTest.java.txt
index 354f5bf..354f5bf 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/NonInternationalizedSmsDetectorTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/NonInternationalizedSmsDetectorTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/NotificationTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/NotificationTest.java.txt
index b03f7a8..b03f7a8 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/NotificationTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/NotificationTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/PasteError.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/PasteError.java.txt
index b12b56b..b12b56b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/PasteError.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/PasteError.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SdCardTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SdCardTest.java.txt
index 2087857..2087857 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SdCardTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SdCardTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SetJavaScriptEnabled.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SetJavaScriptEnabled.java.txt
index ad8383a..ad8383a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SetJavaScriptEnabled.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SetJavaScriptEnabled.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest.java.txt
index 5261e34..5261e34 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest2.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest2.java.txt
index 20c3a21..20c3a21 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest2.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest2.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest3.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest3.java.txt
index e5baa00..e5baa00 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest3.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest3.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest4.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest4.java.txt
index 28de959..28de959 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest4.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest4.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest5.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest5.java.txt
index f005162..f005162 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest5.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SharedPrefsTest5.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormat2.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormat2.java.txt
index a09e44b..a09e44b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormat2.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormat2.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity.java.txt
index c22828f..c22828f 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity2.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity2.java.txt
index c039dce..c039dce 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity2.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity2.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity_ignore.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity_ignore.java.txt
index 58717dc..58717dc 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity_ignore.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/StringFormatActivity_ignore.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SuppressTest5.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SuppressTest5.java.txt
index 1646216..1646216 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SuppressTest5.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/SuppressTest5.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ToastTest.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ToastTest.java.txt
index ce8af3a..ce8af3a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ToastTest.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/ToastTest.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/UnusedReference.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/UnusedReference.java.txt
index 5d7cb87..5d7cb87 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/UnusedReference.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/UnusedReference.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Utf8BomTest.java.data b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Utf8BomTest.java.data
index c8fefcd..c8fefcd 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Utf8BomTest.java.data
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/Utf8BomTest.java.data
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WorldWriteableFile.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WorldWriteableFile.java.txt
index 1e6285b..1e6285b 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WorldWriteableFile.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WorldWriteableFile.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongAnnotation.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongAnnotation.java.txt
index 6fef833..6fef833 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongAnnotation.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongAnnotation.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity.java.txt
index 45e53d0..45e53d0 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity2.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity2.java.txt
index 7cd422a..7cd422a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity2.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity2.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity3.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity3.java.txt
index 1701600..1701600 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity3.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongCastActivity3.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongColor.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongColor.java.txt
index cacd834..cacd834 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongColor.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/src/test/pkg/WrongColor.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/unusedR.java.txt b/lint/cli/src/test/java/com/android/tools/lint/checks/data/unusedR.java.txt
index 3eae431..3eae431 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/unusedR.java.txt
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/unusedR.java.txt
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/wrongid/ids.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/wrongid/ids.xml
index 07e8ae9..07e8ae9 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/wrongid/ids.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/wrongid/ids.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/wrongid/ignorelayout1.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/wrongid/ignorelayout1.xml
index bc6d5fd..bc6d5fd 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/wrongid/ignorelayout1.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/wrongid/ignorelayout1.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/wrongid/layout1.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/wrongid/layout1.xml
index 073dddd..073dddd 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/wrongid/layout1.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/wrongid/layout1.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/wrongid/layout2.xml b/lint/cli/src/test/java/com/android/tools/lint/checks/data/wrongid/layout2.xml
index 54dd91a..54dd91a 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/checks/data/wrongid/layout2.xml
+++ b/lint/cli/src/test/java/com/android/tools/lint/checks/data/wrongid/layout2.xml
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/client/api/DefaultSdkInfoTest.java b/lint/cli/src/test/java/com/android/tools/lint/client/api/DefaultSdkInfoTest.java
index afdc985..afdc985 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/client/api/DefaultSdkInfoTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/client/api/DefaultSdkInfoTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/client/api/LintClientTest.java b/lint/cli/src/test/java/com/android/tools/lint/client/api/LintClientTest.java
index a4376d8..a4376d8 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/client/api/LintClientTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/client/api/LintClientTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/client/api/LintDriverTest.java b/lint/cli/src/test/java/com/android/tools/lint/client/api/LintDriverTest.java
index f4dba93..f4dba93 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/client/api/LintDriverTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/client/api/LintDriverTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/ClassContextTest.java b/lint/cli/src/test/java/com/android/tools/lint/detector/api/ClassContextTest.java
index 71c3486..71c3486 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/ClassContextTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/detector/api/ClassContextTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/IssueTest.java b/lint/cli/src/test/java/com/android/tools/lint/detector/api/IssueTest.java
index c8aaf12..c8aaf12 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/IssueTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/detector/api/IssueTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/LintUtilsTest.java b/lint/cli/src/test/java/com/android/tools/lint/detector/api/LintUtilsTest.java
index 7dfa260..7dfa260 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/LintUtilsTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/detector/api/LintUtilsTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/LocationTest.java b/lint/cli/src/test/java/com/android/tools/lint/detector/api/LocationTest.java
index 6404202..6404202 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/LocationTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/detector/api/LocationTest.java
diff --git a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/ScopeTest.java b/lint/cli/src/test/java/com/android/tools/lint/detector/api/ScopeTest.java
index e95c502..e95c502 100644
--- a/lint/libs/lint_checks/src/test/java/com/android/tools/lint/detector/api/ScopeTest.java
+++ b/lint/cli/src/test/java/com/android/tools/lint/detector/api/ScopeTest.java
diff --git a/lint/libs/lint_checks/Android.mk b/lint/libs/lint_checks/Android.mk
index 0ecb3d0..30fc979 100644
--- a/lint/libs/lint_checks/Android.mk
+++ b/lint/libs/lint_checks/Android.mk
@@ -24,15 +24,3 @@ LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_JAVA_LIBRARY)
 
-# Build tests
-include $(CLEAR_VARS)
-
-# Only compile source java files in this lib.
-LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java)
-
-LOCAL_MODULE := lint_checks-tests
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_JAVA_LIBRARIES := common sdklib lint_api lint_checks lint junit easymock asm-tools asm-tree-tools guava-tools layoutlib_api sdktestutils
-
-include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/lint/libs/lint_checks/src/test/.settings/org.moreunit.prefs b/lint/libs/lint_checks/src/test/.settings/org.moreunit.prefs
deleted file mode 100644
index a3b57cb..0000000
--- a/lint/libs/lint_checks/src/test/.settings/org.moreunit.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Fri Dec 02 12:58:10 PST 2011
-eclipse.preferences.version=1
-org.moreunit.prefixes=
-org.moreunit.unitsourcefolder=lint_check-tests\:src\:lint-api\:src\#lint_check-tests\:src\:lint-checks\:src\#lint_check-tests\:src\:lint-cli\:src
-org.moreunit.useprojectsettings=true