merge conflicts
fix aliasing issues and remove gcc hacks.
Import am-utils 6.x.y
import current am-utils.