Merge "Fix unwind_reg_info tool." am: 8381e72a84
am: 1804a2e687

Change-Id: I13abc9aceb7025bf91b474dfa63e9f84a264faf3