Updates for LLVM merge to r171906 on 20130108.

Change-Id: I368d0dc4be75cd03b4829e9ca76edc51782a1b0d
5 files changed