0.5.1: clean-for-r depends on aapt-generator
Merge branch 'master' into sbt-0.11