Merge "Moved include/backtrace to libbacktrace/include" into oc-dev
am: 95f9a9678d  -s ours

Change-Id: Idf9849a35af69c7ca98bc15be1a7d110b0b155da