Break up android install to force grabbing the new tools first