Remove unnecessary references to libunwind. am: dab952b5d0
am: d8e22479a9

Change-Id: I4723645a6572605dc0b9322949034d35282e583d