Merge "Move sp/pc not changing check into Unwinder."
am: 15251c24b9

Change-Id: If13e5f8f4b46bfaed5cd8654526ba4dce333b0ff