Make sure that all of our supported architectures stop when the ip/cfa does not change. Bug: 20955299 Change-Id: Ic023c71439208ee5ef21efa0298ab7ed1ad03c00 (cherry picked from commit 2706ca23)