Update CCLogSystem
Fix merge issue