Apply changes to migrate to CLANG-160673-20120724.

Change-Id: Iaae5454643a2871fbfa01bcbe52924891c4357d7
2 files changed