Merge "Adapt to clang-r353983 changes."
am: 47eb248855

Change-Id: I7900c78e7c813da45facd8952bf601277d38b284