Switch to combined android cookbook
Remove default recipe to dynamically set machine name