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