Fix uses of DW_CFA_restore_state in assembly code.
am: 1ba7e8c10a

Change-Id: I867da2f7992440d365169fd233184cd68a985962