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

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