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

Change-Id: Ia664851f9967643efe01564da78324e3ded83f63