Merge "Switch to clang-r377782" am: e73d499e47

Change-Id: I20cf94cf8fe45555339a17d1640a96a10f162d15