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

Change-Id: I2c7c3f3937dcd40bee131ba3cda1896a78d3c5b6