Merge "Switch to clang-r377782" am: e73d499e47 am: 3318aa8224

Change-Id: I05f67dd239fc49c0cc932d542053800e832f516e