Merge "Use libunwind's version of unwind.h"