Merge 5428c6b9d for LLVM update to 339409

Change-Id: I3718c7702077b81cf81aca0f9437e9995cc4d67e