Merge "Ensure all PCs in stack_map_test are aligned."
am: 03f16e4de1

Change-Id: I63185a820621a159d778826bb26c90abe643f43d