Get rid of all references to amr1.h and amr2.h this time.
Get rid of all references to amr1.h and amr2.h this time.

CaptainHayashi/sox,pcqpcq/sox,davel/sox,mhartzel/sox_personal_fork,MageSlayer/sox,jacksonh/sox,Motiejus/sox,Distrotech/sox,cbagwell/sox,mhartzel/sox_personal_fork,davel/sox,MageSlayer/sox,MageSlayer/sox,pcqpcq/sox,jacksonh/sox,uklauer/sox,cbagwell/sox,MageSlayer/sox,Distrotech/sox,pcqpcq/sox,Motiejus/sox,CaptainHayashi/sox,Distrotech/sox,MageSlayer/sox,Motiejus/sox,pcqpcq/sox,Distrotech/sox,CaptainHayashi/sox,jacksonh/sox,cbagwell/sox,uklauer/sox,uklauer/sox,cbagwell/sox,jacksonh/sox,mhartzel/sox_personal_fork,mhartzel/sox_personal_fork,Motiejus/sox,davel/sox,uklauer/sox,davel/sox,CaptainHayashi/sox