am e7f07774: am 1c23e5cb: am f0247af9: google-breakpad: cherry-pick @830 from upstream

* commit 'e7f07774675d871e42876df857a6be6e81397400':