Merge "Switch to Clang 3.6."