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

Change-Id: I23f755068816247ac1a80bb620fd407f445023a7