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

Change-Id: I74f0d1d4ed3c12d7ebe45dd9fd7a06d2897c37e8