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

Change-Id: I0e0d26f1e00a10a1ebe1390f67525965910a36e3