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

Change-Id: Iaf82a5cf4b1af8f4f06be6c0bee2496d75a62288