Merge "Switch to clang-r377782d" am: 35d028a7e4 am: 8f7608c3a7

Change-Id: I1601c5510eb2f368759bccf608a7299bdea062e2