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

Change-Id: Ie0f960d696aa631da16e5c17a6c740f4580a16b9