Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE

This reverts commit b1701d8ffc9226e7bec45691c7ff44ed088ebbd0, reversing
changes made to c0d57641568a73cfd7b613a9127557cbcceef5f0.

Change-Id: I71d79634428d420e095d72f5995dfcf40e3628f0
5 files changed