Merge 2b9968a for LLVM update to 339409

Change-Id: I389c0d2ab0bbd0ca55507c27dace4917a3dd5f6f