Merge "Tidy up ARMSOCMapMem() & ARMSOCUnmapMem()"