handle @Extra after @Bean (clean)

the clean version of this PR: https://github.com/excilys/androidannotations/pull/929