Merge "Switch to clang-3859424." into oc-dev
am: f770f1f169

Change-Id: I72a03b71d8f862e019856d16122edd969a7ac158