Merge "Switch to clang-r377782c" am: 850d3a1441 am: 93d26da4f3

Change-Id: I99ed68b28de545679cbe48073659df0e3d87100b