Import upstream commit b886894bd1afc515947c24883169d0a5107a86d5, which fixes the build with clang. Shouldn't be needed anymore when 4.8.x hits the tree. PR: 166271