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

Change-Id: I5bd97e139831c8e06ac947490b80add1bb901613