Merge "Moved include/backtrace to libbacktrace/include" into oc-dev