Merge "Remove unnecessary references to libunwind."
am: 9926e4615d

Change-Id: I3aa76514a87a3760dc26b737a606b4a18a2fe0a2