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

Change-Id: I52d4e601904cb5a432191b9f566cdb33c08d509b