Merge "Switch to clang-3688880."
am: d12816b100

Change-Id: I1ff206c20271aa809de7dfca7743f4575106de13