Merge "Switch to clang-3688880." am: d12816b100 am: 627565d961 am: 0341eb0a7c
am: 635dfdc07a

Change-Id: Ib7e62abfa67188ab881580502c67016493512132