Merge "Add a specialized LocalUnwinder object." am: a6a433a27d
am: 0de472328b

Change-Id: I44901a6e154c60b2009ee99e559f943ea3b94a53