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

* commit 'ba2daca6e572096ffd0c8eb4bbb46c116709bb83':