Merge "Switch to clang-3859424." into oc-dev