Merge "Revert "Fix clang compiled memset recursive call problem."" am: 474a9af0b4 am: 232946f5a9 am: 72a1ff03a1
am: dc809737f2

Change-Id: I0b76acdb04f31bd9faefeb825ce2ff8f6688dae4