Update: restored clang build with a little hack
Update: restored clang build with a little hack

Former-commit-id: f12db335d6b949e52682e173a935dd0d09b28a05
Former-commit-id: f6b370066e5b8ba9861ba26e79bd76c6985062ea
islog/leosac,leosac/leosac,leosac/leosac,leosac/leosac,islog/leosac,islog/leosac