Merge "Fix scudo fault address processing."