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

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