Updates for LLVM merge to r176139.

Change-Id: I360ca25d87eb0799ce39c7612acf34d0b02fb7c1
4 files changed