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

Change-Id: Ib99df518f130828cc9d3402156834dd630814bb8