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

Change-Id: I9a326bdbc94491e5134fa77866ceaa904ca01b7b