Merge "Enable strictmode logging in system_server & add a lock." into gingerbread