Merge "Revert "Fix clang compiled memset recursive call problem.""
am: 474a9af0b4

Change-Id: Ieaab9a6c19f8759d4186ba1b35ea5fa51d9bfc60