Merge "No-one should need libunwind in 2018..." am: 36c37f3ceb
am: 631c98599d

Change-Id: I974d0f8fb20b65a71926094d16c165f1b05b8d95