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

Change-Id: I8bc2c8b92632a43371e313934368bda5dcb14e8f