Improve readability of mastermap output
Improve readability of mastermap output

- Remove host suffixes '.chromium.org' and '.corp.google.com'.
- Add merge conflicts for agable's crrev.com/85773005.

This was reviewed in r237219, but the diff was accidentally
removed during a rebase.

TBR=agable@chromium.org

Review URL: https://codereview.chromium.org/87703002

git-svn-id: 239fca9b83025a0b6f823aeeca02ba5be3d9fd76@237291 0039d316-1c4b-4281-b951-d872f2087c98

eunchong/build,eunchong/build,eunchong/build,eunchong/build