Upgrade to 0.6.+ version of android gradle plugin