Fixing issue 446: R.java for aar libraries doesn't generate in some cases
Fixing issue 446: R.java for aar libraries doesn't generate. step 2
removing unused executor from ApklibMojo
Merge pull request #291 from marchelo/removing-unused-executor

removing unused executor from ApklibMojo
Merge pull request #287 from marchelo/issue-446

Fixing issue 446: R.java for aar libraries doesn't generate in some cases
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/com/jayway/maven/plugins/android/phase01generatesources/GenerateSourcesMojo.java