Merge "Revert^2 "ARM: Use r4 for stack overflow check to reduce code size."" am: e65948f7c7 am: 764254ff0b
am: f8a8eb99cf

Change-Id: Ia967bdb341aec0e3aa33efb96730b97190285400