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

Change-Id: Ib61e9c5e59fbdd1e0b7820eebc9cb3cad9861a0a