Merge branch 'master' into assisted-injections

Conflicts:
	compiler/src/main/java/dagger/internal/codegen/InjectProcessor.java
	compiler/src/main/java/dagger/internal/codegen/ProvidesProcessor.java