Added changes that were committed to 'assembly' branch to support the newest version of egraph_arm