Apply rL216114 from upstream LLVM.

bug 18094492

Change-Id: Ic049d4123b9240d89daf4f3c5e8d82e8276a84e7
2 files changed