Fix clang_delta compilation on Clang 3.4svn.
Merge ae64e8ae3e9a9dc832df1d7752dd977f85cf90ff into c71991ec5a914f77537f7243763f58eabb0bcb13