Address review comment: More maintainable choosing of arch
Address review comment: More maintainable choosing of arch

lukemarsden/flocker,adamtheturtle/flocker,agonzalezro/flocker,achanda/flocker,agonzalezro/flocker,wallnerryan/flocker-profiles,jml/flocker,wallnerryan/flocker-profiles,AndyHuu/flocker,jml/flocker,AndyHuu/flocker,hackday-profilers/flocker,moypray/flocker,LaynePeng/flocker,adamtheturtle/flocker,achanda/flocker,w4ngyi/flocker,AndyHuu/flocker,hackday-profilers/flocker,1d4Nf6/flocker,Azulinho/flocker,mbrukman/flocker,mbrukman/flocker,moypray/flocker,w4ngyi/flocker,LaynePeng/flocker,w4ngyi/flocker,agonzalezro/flocker,moypray/flocker,lukemarsden/flocker,adamtheturtle/flocker,1d4Nf6/flocker,mbrukman/flocker,Azulinho/flocker,jml/flocker,lukemarsden/flocker,LaynePeng/flocker,hackday-profilers/flocker,wallnerryan/flocker-profiles,Azulinho/flocker,1d4Nf6/flocker,achanda/flocker