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

Change-Id: I998f915dab7253d6e7df6161c839e82d92045258