am e5cdc13a: am 60ddfbe0: am 480a20a3: Merge remote branch \'cros/upstream\' into merge-branch. Brings us up to google-breakpad\'s 734.

* commit 'e5cdc13ab7d8ad0c4476cf5125c68a592d65f91c':