Merge pull request #393 from google/moe_writing_branch_from_1acee258273fe7e06fbf79ce3f014b230123abfd

Latest changes from Google.

Author: cgruber

common/pom.xml

@@ -75,6 +75,12 @@
       <version>${truth.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jdt.core.compiler</groupId>
+      <artifactId>ecj</artifactId>
+      <version>4.5.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

common/src/main/java/com/google/auto/common/MoreElements.java

@@ -310,7 +310,7 @@ public static ImmutableSet<ExecutableElement> getLocalAndInheritedMethods(
     // TODO(emcmanus): detect if the Types and Elements are the javac ones, and use
     //   NativeOverrides if so. We may need to adjust the logic further to avoid the bug
     //   tested for by MoreElementsTest.getLocalAndInheritedMethods_DaggerBug.
-    Overrides overrides = new Overrides.ExplicitOverrides(typeUtils, elementUtils);
+    Overrides overrides = new Overrides.ExplicitOverrides(typeUtils);
     return getLocalAndInheritedMethods(type, overrides);
   }