Merge 4f7c361df for LLVM update to 339409

Change-Id: Ica0ede7a62932c0e7222761117426230b4fd8e59