Merge 3c92011b60 for LLVM update to 522817

Test: presubmit
Change-Id: If946b1b427b2a2434b8a06b042b8954200aa0c92
1 file changed