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

Change-Id: Ia76affdc92d66bab8d3835472ffcd74e57414c6d