Merge "Revert "Fix clang compiled memset recursive call problem.""