Merge branch 'merge-crash-reporter-rewrite' into merge-crash-reporter BUG=chromium:370261 Change-Id: I53d6f5ad57d55bf467023856c26699c7231bf86c