am 2cf15571: am 40bc7cd4: (-s ours) DO NOT MERGE  Re-add .save directive for arm assembler code.

* commit '2cf155713aaba451065d593335d544f2ada24ddf':
  DO NOT MERGE  Re-add .save directive for arm assembler code.