0.7.1 Wrap AndroidBuilder tasks in cached()

Do not perform collect-resources, r-generator or package-resources if
there are no changes
Merge branch 'master' into sbt-0.11