Revert "Merge remote-tracking branch 'goog/master-skia' into goog/master"

This reverts commit 0efb99a7c27bb2c4fc1a89993da5948a4e971823.

Change-Id: I971811435410091088a932f79ddbe254fd80e79d
2663 files changed