Update to use latest android gradle plugin