Merge "Fix ASan/Clang build."