Merge "Remove include of backtrace/Backtrace.h." am: e9cef73e17
am: ec837ce4d9

Change-Id: I348d884ec7607d0cb67fb225cc50b9fcb4296cb9