Prefer resource ids declared by application over colliding names from library projects. Fixes #469.
Merge branch 'master' of https://github.com/robolectric/robolectric