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

Change-Id: Idb80b0d869ddf3776ee1e1c564b2675b7893e319