Merge "Revert "Switch from clang 3.6 to new clang repository (with 3.8).""