refactored deploy-android to be more genearic