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

Change-Id: Ibb8701553a6d548da1ac50ac38c19da71f412ac0