This reverts r366441 (git commit 48104ef7) This causes clang to fail to compile some file in Skia. Reduction soon. llvm-svn: 366501