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

Change-Id: I69fc6953195dca36732a149cc3d3e7ead8c3a6a6