Changed build scripts to use my AA clone