Backport CL148346 from upstream: --no-canonical-prefixes

Review URL: http://codereview.chromium.org/3156009
2 files changed