am cd285d7d: Merge "crash_reporter: Fix initial compile issues with Android toolchain"

* commit 'cd285d7d26e42eee91daf55be3378da595fee5ad':
  crash_reporter: Fix initial compile issues with Android toolchain