Feature/merging aar resources

The fix for the problem https://github.com/jayway/maven-android-plugin/issues/345