Merge "Remove unnecessary references to libunwind."
am: c5943fd3fa

Change-Id: I076c20a5bad525db62ef2e40cc84f72f3db29e20