Various fixes to add samples for supporting 2 architectures
Merge branch 'master' of https://github.com/jayway/maven-android-plugin-samples
Merge branch 'master' of https://github.com/jayway/maven-android-plugin-samples
Merge pull request #35 from johanlindquist/master

Updates for fixes to support multiple architectures