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

Change-Id: Ie86bdf7abbf2971a3646b845b50b522b7d4c2308