am 85466cbe: am 43730fe3: Apply changes to migrate to CLANG-160673-20120724.

* commit '85466cbe1b0e0b86f95262a2e1eec0fe240a576d':
  Apply changes to migrate to CLANG-160673-20120724.