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

Change-Id: I10973a3ce74636ab75d662aabc30dc05289a26d9