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

Change-Id: If906f38036b3c2e74c9057885bbc63de84824b0c