ARM fixes for 2.065
Fix partial merged ARM EH code