am 7f3e8b65: (-s ours) am 916a5c86: am 0f6c07b7: Merge "crash_reporter: Add Android.mk"

* commit '7f3e8b6574cb58ca94fd08d566b17308166ff4d4':