Add some maven love and revert some java7isms from google's internal changes to dagger.