Allow compilation in both ARC and non-ARC modes.
Merge branch 'merge/karelia/dual-mode-arc'