Merge "Fix clang compiled memset recursive call problem."
am: e57b56c7b6

Change-Id: I8eab89f8cd90f8fa24d3707aeb7b54a973d6f11e