am 532df433: (-s ours) am bd1b5f34: am cd285d7d: Merge "crash_reporter: Fix initial compile issues with Android toolchain"

* commit '532df43310fdf11510b58d313744b094884287fe':