Merge "Improve the comment in the ARM setjmp.S." am: 177429cb8d
am: 960bcf2d67

Change-Id: I0169a9a694e573140da8a1558c64c7bed2514374