Upgrade for gradle wrapper 1.8-1.9 and android plugin 0.6.1-0.7.1

The new android studio sets these as a minimum requirement.

One problem with the upgrade - it now throws an error on previous bad behaviour assembling files which copy over each other for which we just workaround for now (refer to #194).