Apply changes to migrate to llvm upstream r146714.

Change-Id: I422992072f519c9352fe4d527719422134297b41
4 files changed