Merge "Remove unnecessary references to libunwind." am: 00c81fefd3
am: 74759f8380

Change-Id: I3c49f07d7222be5b3e68801fb99c0766a76473bd