Merge a32ea61a for LLVM update to 339409

Change-Id: I4f975e04866a6b894b92249c4badcaec38467fbb