use latest build-tools as they are available now on cloudbees
cleanup  & use AndroidHelper