Merge "Remove unnecessary references to libunwind."
am: 10e3fdd263

Change-Id: I433ecf87053750d15dc75fb6af384acb7ba5988d