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

Change-Id: Ic41a6d99d4341cfcbbc658bab02d87dae309d579