Merge "Always set the sp reg to the cfa for DWARF."
am: b22451f178

Change-Id: I515033f35e1ec1dc6cd11673c5ef5dfaff487984