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

* commit '43730fe3c839af391efe6bdf56b0479860121924':
  Apply changes to migrate to CLANG-160673-20120724.