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

Change-Id: I1a83ee2a65ff24914711c422ed322af88a883ada