Switch back to android build to get the tools