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

Change-Id: I36064f4675a785c6a9a228af79eed51071fe4205