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

Change-Id: I0c0b26844fe5791f17e8246913540a68d64def30