merge from tools_r8

Change-Id: I907004c9f3c55a7e454e0bca644fa4efe200f15b

diff --cc eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java
Simple merge

diff --cc eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParser.java
index 99ae860,944aced..c3cd89f
--- 1/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParser.java
--- 2/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParser.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParser.java
@@@ -16,10 -16,12 +16,12 @@@
  
  package com.android.ide.eclipse.adt.internal.resources;
  
 +import com.android.ide.common.api.IAttributeInfo.Format;
  import com.android.ide.eclipse.adt.AdtPlugin;
 -import com.android.ide.eclipse.adt.editors.layout.gscripts.IAttributeInfo.Format;
  import com.android.ide.eclipse.adt.internal.editors.descriptors.DescriptorsUtils;
  import com.android.ide.eclipse.adt.internal.resources.ViewClassInfo.LayoutParamsInfo;
+ import com.android.sdklib.annotations.VisibleForTesting;
+ import com.android.sdklib.annotations.VisibleForTesting.Visibility;
  
  import org.eclipse.core.runtime.IStatus;
  import org.w3c.dom.Document;

diff --cc eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParserTest.java
Simple merge