am 61c677c8: (-s ours) am cbc6b915: am d4555689: Merge "crash_reporter: Enable core dumps"

* commit '61c677c8ca18da641772edd37d30049c83aca58a':