Updated to latest android gradle plugin and build tools